Merge commit 'v2.6.27-rc1' into x86/urgent

1252 files changed, 28259 insertions, 15457 deletions

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 118ca6e9404f..f79ad9ff6031 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -528,7 +528,33 @@ See more details on the proper patch format in the following
 references.
 
 
+16) Sending "git pull" requests  (from Linus emails)
 
+Please write the git repo address and branch name alone on the same line
+so that I can't even by mistake pull from the wrong branch, and so
+that a triple-click just selects the whole thing.
+
+So the proper format is something along the lines of:
+
+        "Please pull from
+
+                git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
+
+         to get these changes:"
+
+so that I don't have to hunt-and-peck for the address and inevitably
+get it wrong (actually, I've only gotten it wrong a few times, and
+checking against the diffstat tells me when I get it wrong, but I'm
+just a lot more comfortable when I don't have to "look for" the right
+thing to pull, and double-check that I have the right branch-name).
+
+
+Please use "git diff -M --stat --summary" to generate the diffstat:
+the -M enables rename detection, and the summary enables a summary of
+new/deleted or renamed files.
+
+With rename detection, the statistics are rather different [...]
+because git will notice that a fair number of the changes are renames.
 
 -----------------------------------
 SECTION 2 - HINTS, TIPS, AND TRICKS
diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts
index 0d3dbf1099bc..c202ed35d7d6 100644
--- a/Documentation/arm/Interrupts
+++ b/Documentation/arm/Interrupts
@@ -138,14 +138,8 @@ So, what's changed?
 
                 Set active the IRQ edge(s)/level.  This replaces the
                 SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge()
-                function.  Type should be one of the following:
-
-                #define IRQT_NOEDGE     (0)
-                #define IRQT_RISING     (__IRQT_RISEDGE)
-                #define IRQT_FALLING    (__IRQT_FALEDGE)
-                #define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)
-                #define IRQT_LOW        (__IRQT_LOWLVL)
-                #define IRQT_HIGH       (__IRQT_HIGHLVL)
+                function.  Type should be one of IRQ_TYPE_xxx defined in
+                <linux/irq.h>
 
 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.
 
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 721c71b86e06..c23955404bf5 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -47,6 +47,30 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------
 
+What:   old tuner-3036 i2c driver
+When:   2.6.28
+Why:    This driver is for VERY old i2c-over-parallel port teletext receiver
+        boxes. Rather then spending effort on converting this driver to V4L2,
+        and since it is extremely unlikely that anyone still uses one of these
+        devices, it was decided to drop it.
+Who:    Hans Verkuil <hverkuil@xs4all.nl>
+        Mauro Carvalho Chehab <mchehab@infradead.org>
+
+ ---------------------------
+
+What:   V4L2 dpc7146 driver
+When:   2.6.28
+Why:    Old driver for the dpc7146 demonstration board that is no longer
+        relevant. The last time this was tested on actual hardware was
+        probably around 2002. Since this is a driver for a demonstration
+        board the decision was made to remove it rather than spending a
+        lot of effort continually updating this driver to stay in sync
+        with the latest internal V4L2 or I2C API.
+Who:    Hans Verkuil <hverkuil@xs4all.nl>
+        Mauro Carvalho Chehab <mchehab@infradead.org>
+
+---------------------------
+
 What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
 When:   November 2005
 Files:  drivers/pcmcia/: pcmcia_ioctl.c
diff --git a/Documentation/i2c/upgrading-clients b/Documentation/i2c/upgrading-clients
new file mode 100644
index 000000000000..9a45f9bb6a25
--- /dev/null
+++ b/Documentation/i2c/upgrading-clients
@@ -0,0 +1,281 @@
+Upgrading I2C Drivers to the new 2.6 Driver Model
+=================================================
+
+Ben Dooks <ben-linux@fluff.org>
+
+Introduction
+------------
+
+This guide outlines how to alter existing Linux 2.6 client drivers from
+the old to the new new binding methods.
+
+
+Example old-style driver
+------------------------
+
+
+struct example_state {
+        struct i2c_client       client;
+        ....
+};
+
+static struct i2c_driver example_driver;
+
+static unsigned short ignore[] = { I2C_CLIENT_END };
+static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static int example_attach(struct i2c_adapter *adap, int addr, int kind)
+{
+        struct example_state *state;
+        struct device *dev = &adap->dev;  /* to use for dev_ reports */
+        int ret;
+
+        state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
+        if (state == NULL) {
+                dev_err(dev, "failed to create our state\n");
+                return -ENOMEM;
+        }
+
+        example->client.addr    = addr;
+        example->client.flags   = 0;
+        example->client.adapter = adap;
+
+        i2c_set_clientdata(&state->i2c_client, state);
+        strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE);
+
+        ret = i2c_attach_client(&state->i2c_client);
+        if (ret < 0) {
+                dev_err(dev, "failed to attach client\n");
+                kfree(state);
+                return ret;
+        }
+
+        dev = &state->i2c_client.dev;
+
+        /* rest of the initialisation goes here. */
+
+        dev_info(dev, "example client created\n");
+
+        return 0;
+}
+
+static int __devexit example_detach(struct i2c_client *client)
+{
+        struct example_state *state = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        kfree(state);
+        return 0;
+}
+
+static int example_attach_adapter(struct i2c_adapter *adap)
+{
+        return i2c_probe(adap, &addr_data, example_attach);
+}
+
+static struct i2c_driver example_driver = {
+        .driver         = {
+                .owner          = THIS_MODULE,
+                .name           = "example",
+        },
+        .attach_adapter = example_attach_adapter,
+        .detach_client  = __devexit_p(example_detach),
+        .suspend        = example_suspend,
+        .resume         = example_resume,
+};
+
+
+Updating the client
+-------------------
+
+The new style binding model will check against a list of supported
+devices and their associated address supplied by the code registering
+the busses. This means that the driver .attach_adapter and
+.detach_adapter methods can be removed, along with the addr_data,
+as follows:
+
+- static struct i2c_driver example_driver;
+
+- static unsigned short ignore[] = { I2C_CLIENT_END };
+- static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END };
+
+- I2C_CLIENT_INSMOD;
+
+- static int example_attach_adapter(struct i2c_adapter *adap)
+- {
+-       return i2c_probe(adap, &addr_data, example_attach);
+- }
+
+ static struct i2c_driver example_driver = {
+-       .attach_adapter = example_attach_adapter,
+-       .detach_client  = __devexit_p(example_detach),
+ }
+
+Add the probe and remove methods to the i2c_driver, as so:
+
+ static struct i2c_driver example_driver = {
++       .probe          = example_probe,
++       .remove         = __devexit_p(example_remove),
+ }
+
+Change the example_attach method to accept the new parameters
+which include the i2c_client that it will be working with:
+
+- static int example_attach(struct i2c_adapter *adap, int addr, int kind)
++ static int example_probe(struct i2c_client *client,
++                          const struct i2c_device_id *id)
+
+Change the name of example_attach to example_probe to align it with the
+i2c_driver entry names. The rest of the probe routine will now need to be
+changed as the i2c_client has already been setup for use.
+
+The necessary client fields have already been setup before
+the probe function is called, so the following client setup
+can be removed:
+
+-       example->client.addr    = addr;
+-       example->client.flags   = 0;
+-       example->client.adapter = adap;
+-
+-       strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE);
+
+The i2c_set_clientdata is now:
+
+-       i2c_set_clientdata(&state->client, state);
++       i2c_set_clientdata(client, state);
+
+The call to i2c_attach_client is no longer needed, if the probe
+routine exits successfully, then the driver will be automatically
+attached by the core. Change the probe routine as so:
+
+-       ret = i2c_attach_client(&state->i2c_client);
+-       if (ret < 0) {
+-               dev_err(dev, "failed to attach client\n");
+-               kfree(state);
+-               return ret;
+-       }
+
+
+Remove the storage of 'struct i2c_client' from the 'struct example_state'
+as we are provided with the i2c_client in our example_probe. Instead we
+store a pointer to it for when it is needed.
+
+struct example_state {
+-       struct i2c_client       client;
++       struct i2c_client       *client;
+
+the new i2c client as so:
+
+-       struct device *dev = &adap->dev;  /* to use for dev_ reports */
++       struct device *dev = &i2c_client->dev;  /* to use for dev_ reports */
+
+And remove the change after our client is attached, as the driver no
+longer needs to register a new client structure with the core:
+
+-       dev = &state->i2c_client.dev;
+
+In the probe routine, ensure that the new state has the client stored
+in it:
+
+static int example_probe(struct i2c_client *i2c_client,
+                         const struct i2c_device_id *id)
+{
+        struct example_state *state;
+        struct device *dev = &i2c_client->dev;
+        int ret;
+
+        state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
+        if (state == NULL) {
+                dev_err(dev, "failed to create our state\n");
+                return -ENOMEM;
+        }
+
++       state->client = i2c_client;
+
+Update the detach method, by changing the name to _remove and
+to delete the i2c_detach_client call. It is possible that you
+can also remove the ret variable as it is not not needed for
+any of the core functions.
+
+- static int __devexit example_detach(struct i2c_client *client)
++ static int __devexit example_remove(struct i2c_client *client)
+{
+        struct example_state *state = i2c_get_clientdata(client);
+
+-       i2c_detach_client(client);
+
+And finally ensure that we have the correct ID table for the i2c-core
+and other utilities:
+
++ struct i2c_device_id example_idtable[] = {
++       { "example", 0 },
++       { }
++};
++
++MODULE_DEVICE_TABLE(i2c, example_idtable);
+
+static struct i2c_driver example_driver = {
+        .driver         = {
+                .owner          = THIS_MODULE,
+                .name           = "example",
+        },
++       .id_table       = example_ids,
+
+
+Our driver should now look like this:
+
+struct example_state {
+        struct i2c_client       *client;
+        ....
+};
+
+static int example_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct example_state *state;
+        struct device *dev = &client->dev;
+
+        state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
+        if (state == NULL) {
+                dev_err(dev, "failed to create our state\n");
+                return -ENOMEM;
+        }
+
+        state->client = client;
+        i2c_set_clientdata(client, state);
+
+        /* rest of the initialisation goes here. */
+
+        dev_info(dev, "example client created\n");
+
+        return 0;
+}
+
+static int __devexit example_remove(struct i2c_client *client)
+{
+        struct example_state *state = i2c_get_clientdata(client);
+
+        kfree(state);
+        return 0;
+}
+
+static struct i2c_device_id example_idtable[] = {
+        { "example", 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, example_idtable);
+
+static struct i2c_driver example_driver = {
+        .driver         = {
+                .owner          = THIS_MODULE,
+                .name           = "example",
+        },
+        .id_table       = example_idtable,
+        .probe          = example_probe,
+        .remove         = __devexit_p(example_remove),
+        .suspend        = example_suspend,
+        .resume         = example_resume,
+};
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 9691c7f5166c..0705040531a5 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -65,26 +65,26 @@ Install kexec-tools
 
 2) Download the kexec-tools user-space package from the following URL:
 
-http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-testing.tar.gz
+http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools.tar.gz
 
-This is a symlink to the latest version, which at the time of writing is
-20061214, the only release of kexec-tools-testing so far. As other versions
-are released, the older ones will remain available at
-http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+This is a symlink to the latest version.
 
-Note: Latest kexec-tools-testing git tree is available at
+The latest kexec-tools git tree is available at:
 
-git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools-testing.git
+git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git
 or
-http://www.kernel.org/git/?p=linux/kernel/git/horms/kexec-tools-testing.git;a=summary
+http://www.kernel.org/git/?p=linux/kernel/git/horms/kexec-tools.git
+
+More information about kexec-tools can be found at
+http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/README.html
 
 3) Unpack the tarball with the tar command, as follows:
 
-   tar xvpzf kexec-tools-testing.tar.gz
+   tar xvpzf kexec-tools.tar.gz
 
 4) Change to the kexec-tools directory, as follows:
 
-   cd kexec-tools-testing-VERSION
+   cd kexec-tools-VERSION
 
 5) Configure the package, as follows:
 
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 82fafe0429fe..b88b0ea54e90 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -36,11 +36,13 @@
 #include <sched.h>
 #include <limits.h>
 #include <stddef.h>
+#include <signal.h>
 #include "linux/lguest_launcher.h"
 #include "linux/virtio_config.h"
 #include "linux/virtio_net.h"
 #include "linux/virtio_blk.h"
 #include "linux/virtio_console.h"
+#include "linux/virtio_rng.h"
 #include "linux/virtio_ring.h"
 #include "asm-x86/bootparam.h"
 /*L:110 We can ignore the 39 include files we need for this program, but I do
@@ -64,8 +66,8 @@ typedef uint8_t u8;
 #endif
 /* We can have up to 256 pages for devices. */
 #define DEVICE_PAGES 256
-/* This will occupy 2 pages: it must be a power of 2. */
-#define VIRTQUEUE_NUM 128
+/* This will occupy 3 pages: it must be a power of 2. */
+#define VIRTQUEUE_NUM 256
 
 /*L:120 verbose is both a global flag and a macro.  The C preprocessor allows
  * this, and although I wouldn't recommend it, it works quite nicely here. */
@@ -74,12 +76,19 @@ static bool verbose;
         do { if (verbose) printf(args); } while(0)
 /*:*/
 
-/* The pipe to send commands to the waker process */
-static int waker_fd;
+/* File descriptors for the Waker. */
+struct {
+        int pipe[2];
+        int lguest_fd;
+} waker_fds;
+
 /* The pointer to the start of guest memory. */
 static void *guest_base;
 /* The maximum guest physical address allowed, and maximum possible. */
 static unsigned long guest_limit, guest_max;
+/* The pipe for signal hander to write to. */
+static int timeoutpipe[2];
+static unsigned int timeout_usec = 500;
 
 /* a per-cpu variable indicating whose vcpu is currently running */
 static unsigned int __thread cpu_id;
@@ -155,11 +164,14 @@ struct virtqueue
         /* Last available index we saw. */
         u16 last_avail_idx;
 
-        /* The routine to call when the Guest pings us. */
-        void (*handle_output)(int fd, struct virtqueue *me);
+        /* The routine to call when the Guest pings us, or timeout. */
+        void (*handle_output)(int fd, struct virtqueue *me, bool timeout);
 
         /* Outstanding buffers */
         unsigned int inflight;
+
+        /* Is this blocked awaiting a timer? */
+        bool blocked;
 };
 
 /* Remember the arguments to the program so we can "reboot" */
@@ -190,6 +202,9 @@ static void *_convert(struct iovec *iov, size_t size, size_t align,
         return iov->iov_base;
 }
 
+/* Wrapper for the last available index.  Makes it easier to change. */
+#define lg_last_avail(vq)       ((vq)->last_avail_idx)
+
 /* The virtio configuration space is defined to be little-endian.  x86 is
  * little-endian too, but it's nice to be explicit so we have these helpers. */
 #define cpu_to_le16(v16) (v16)
@@ -199,6 +214,33 @@ static void *_convert(struct iovec *iov, size_t size, size_t align,
 #define le32_to_cpu(v32) (v32)
 #define le64_to_cpu(v64) (v64)
 
+/* Is this iovec empty? */
+static bool iov_empty(const struct iovec iov[], unsigned int num_iov)
+{
+        unsigned int i;
+
+        for (i = 0; i < num_iov; i++)
+                if (iov[i].iov_len)
+                        return false;
+        return true;
+}
+
+/* Take len bytes from the front of this iovec. */
+static void iov_consume(struct iovec iov[], unsigned num_iov, unsigned len)
+{
+        unsigned int i;
+
+        for (i = 0; i < num_iov; i++) {
+                unsigned int used;
+
+                used = iov[i].iov_len < len ? iov[i].iov_len : len;
+                iov[i].iov_base += used;
+                iov[i].iov_len -= used;
+                len -= used;
+        }
+        assert(len == 0);
+}
+
 /* The device virtqueue descriptors are followed by feature bitmasks. */
 static u8 *get_feature_bits(struct device *dev)
 {
@@ -254,6 +296,7 @@ static void *map_zeroed_pages(unsigned int num)
                     PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0);
         if (addr == MAP_FAILED)
                 err(1, "Mmaping %u pages of /dev/zero", num);
+        close(fd);
 
         return addr;
 }
@@ -540,69 +583,64 @@ static void add_device_fd(int fd)
  * watch, but handing a file descriptor mask through to the kernel is fairly
  * icky.
  *
- * Instead, we fork off a process which watches the file descriptors and writes
+ * Instead, we clone off a thread which watches the file descriptors and writes
  * the LHREQ_BREAK command to the /dev/lguest file descriptor to tell the Host
  * stop running the Guest.  This causes the Launcher to return from the
  * /dev/lguest read with -EAGAIN, where it will write to /dev/lguest to reset
  * the LHREQ_BREAK and wake us up again.
  *
  * This, of course, is merely a different *kind* of icky.
+ *
+ * Given my well-known antipathy to threads, I'd prefer to use processes.  But
+ * it's easier to share Guest memory with threads, and trivial to share the
+ * devices.infds as the Launcher changes it.
  */
-static void wake_parent(int pipefd, int lguest_fd)
+static int waker(void *unused)
 {
-        /* Add the pipe from the Launcher to the fdset in the device_list, so
-         * we watch it, too. */
-        add_device_fd(pipefd);
+        /* Close the write end of the pipe: only the Launcher has it open. */
+        close(waker_fds.pipe[1]);
 
         for (;;) {
                 fd_set rfds = devices.infds;
                 unsigned long args[] = { LHREQ_BREAK, 1 };
+                unsigned int maxfd = devices.max_infd;
+
+                /* We also listen to the pipe from the Launcher. */
+                FD_SET(waker_fds.pipe[0], &rfds);
+                if (waker_fds.pipe[0] > maxfd)
+                        maxfd = waker_fds.pipe[0];
 
                 /* Wait until input is ready from one of the devices. */
-                select(devices.max_infd+1, &rfds, NULL, NULL, NULL);
-                /* Is it a message from the Launcher? */
-                if (FD_ISSET(pipefd, &rfds)) {
-                        int fd;
-                        /* If read() returns 0, it means the Launcher has
-                         * exited.  We silently follow. */
-                        if (read(pipefd, &fd, sizeof(fd)) == 0)
-                                exit(0);
-                        /* Otherwise it's telling us to change what file
-                         * descriptors we're to listen to.  Positive means
-                         * listen to a new one, negative means stop
-                         * listening. */
-                        if (fd >= 0)
-                                FD_SET(fd, &devices.infds);
-                        else
-                                FD_CLR(-fd - 1, &devices.infds);
-                } else /* Send LHREQ_BREAK command. */
-                        pwrite(lguest_fd, args, sizeof(args), cpu_id);
+                select(maxfd+1, &rfds, NULL, NULL, NULL);
+
+                /* Message from Launcher? */
+                if (FD_ISSET(waker_fds.pipe[0], &rfds)) {
+                        char c;
+                        /* If this fails, then assume Launcher has exited.
+                         * Don't do anything on exit: we're just a thread! */
+                        if (read(waker_fds.pipe[0], &c, 1) != 1)
+                                _exit(0);
+                        continue;
+                }
+
+                /* Send LHREQ_BREAK command to snap the Launcher out of it. */
+                pwrite(waker_fds.lguest_fd, args, sizeof(args), cpu_id);
         }
+        return 0;
 }
 
 /* This routine just sets up a pipe to the Waker process. */
-static int setup_waker(int lguest_fd)
-{
-        int pipefd[2], child;
-
-        /* We create a pipe to talk to the Waker, and also so it knows when the
-         * Launcher dies (and closes pipe). */
-        pipe(pipefd);
-        child = fork();
-        if (child == -1)
-                err(1, "forking");
-
-        if (child == 0) {
-                /* We are the Waker: close the "writing" end of our copy of the
-                 * pipe and start waiting for input. */
-                close(pipefd[1]);
-                wake_parent(pipefd[0], lguest_fd);
-        }
-        /* Close the reading end of our copy of the pipe. */
-        close(pipefd[0]);
+static void setup_waker(int lguest_fd)
+{
+        /* This pipe is closed when Launcher dies, telling Waker. */
+        if (pipe(waker_fds.pipe) != 0)
+                err(1, "Creating pipe for Waker");
 
-        /* Here is the fd used to talk to the waker. */
-        return pipefd[1];
+        /* Waker also needs to know the lguest fd */
+        waker_fds.lguest_fd = lguest_fd;
+
+        if (clone(waker, malloc(4096) + 4096, CLONE_VM | SIGCHLD, NULL) == -1)
+                err(1, "Creating Waker");
 }
 
 /*
@@ -661,19 +699,22 @@ static unsigned get_vq_desc(struct virtqueue *vq,
                             unsigned int *out_num, unsigned int *in_num)
 {
         unsigned int i, head;
+        u16 last_avail;
 
         /* Check it isn't doing very strange things with descriptor numbers. */
-        if ((u16)(vq->vring.avail->idx - vq->last_avail_idx) > vq->vring.num)
+        last_avail = lg_last_avail(vq);
+        if ((u16)(vq->vring.avail->idx - last_avail) > vq->vring.num)
                 errx(1, "Guest moved used index from %u to %u",
-                     vq->last_avail_idx, vq->vring.avail->idx);
+                     last_avail, vq->vring.avail->idx);
 
         /* If there's nothing new since last we looked, return invalid. */
-        if (vq->vring.avail->idx == vq->last_avail_idx)
+        if (vq->vring.avail->idx == last_avail)
                 return vq->vring.num;
 
         /* Grab the next descriptor number they're advertising, and increment
          * the index we've seen. */
-        head = vq->vring.avail->ring[vq->last_avail_idx++ % vq->vring.num];
+        head = vq->vring.avail->ring[last_avail % vq->vring.num];
+        lg_last_avail(vq)++;
 
         /* If their number is silly, that's a fatal mistake. */
         if (head >= vq->vring.num)
@@ -821,8 +862,8 @@ static bool handle_console_input(int fd, struct device *dev)
                                 unsigned long args[] = { LHREQ_BREAK, 0 };
                                 /* Close the fd so Waker will know it has to
                                  * exit. */
-                                close(waker_fd);
-                                /* Just in case waker is blocked in BREAK, send
+                                close(waker_fds.pipe[1]);
+                                /* Just in case Waker is blocked in BREAK, send
                                  * unbreak now. */
                                 write(fd, args, sizeof(args));
                                 exit(2);
@@ -839,7 +880,7 @@ static bool handle_console_input(int fd, struct device *dev)
 
 /* Handling output for console is simple: we just get all the output buffers
  * and write them to stdout. */
-static void handle_console_output(int fd, struct virtqueue *vq)
+static void handle_console_output(int fd, struct virtqueue *vq, bool timeout)
 {
         unsigned int head, out, in;
         int len;
@@ -854,6 +895,21 @@ static void handle_console_output(int fd, struct virtqueue *vq)
         }
 }
 
+static void block_vq(struct virtqueue *vq)
+{
+        struct itimerval itm;
+
+        vq->vring.used->flags |= VRING_USED_F_NO_NOTIFY;
+        vq->blocked = true;
+
+        itm.it_interval.tv_sec = 0;
+        itm.it_interval.tv_usec = 0;
+        itm.it_value.tv_sec = 0;
+        itm.it_value.tv_usec = timeout_usec;
+
+        setitimer(ITIMER_REAL, &itm, NULL);
+}
+
 /*
  * The Network
  *
@@ -861,22 +917,34 @@ static void handle_console_output(int fd, struct virtqueue *vq)
  * and write them (ignoring the first element) to this device's file descriptor
  * (/dev/net/tun).
  */
-static void handle_net_output(int fd, struct virtqueue *vq)
+static void handle_net_output(int fd, struct virtqueue *vq, bool timeout)
 {
-        unsigned int head, out, in;
+        unsigned int head, out, in, num = 0;
         int len;
         struct iovec iov[vq->vring.num];
+        static int last_timeout_num;
 
         /* Keep getting output buffers from the Guest until we run out. */
         while ((head = get_vq_desc(vq, iov, &out, &in)) != vq->vring.num) {
                 if (in)
                         errx(1, "Input buffers in output queue?");
-                /* Check header, but otherwise ignore it (we told the Guest we
-                 * supported no features, so it shouldn't have anything
-                 * interesting). */
-                (void)convert(&iov[0], struct virtio_net_hdr);
-                len = writev(vq->dev->fd, iov+1, out-1);
+                len = writev(vq->dev->fd, iov, out);
+                if (len < 0)
+                        err(1, "Writing network packet to tun");
                 add_used_and_trigger(fd, vq, head, len);
+                num++;
+        }
+
+        /* Block further kicks and set up a timer if we saw anything. */
+        if (!timeout && num)
+                block_vq(vq);
+
+        if (timeout) {
+                if (num < last_timeout_num)
+                        timeout_usec += 10;
+                else if (timeout_usec > 1)
+                        timeout_usec--;
+                last_timeout_num = num;
         }
 }
 
@@ -887,7 +955,6 @@ static bool handle_tun_input(int fd, struct device *dev)
         unsigned int head, in_num, out_num;
         int len;
         struct iovec iov[dev->vq->vring.num];
-        struct virtio_net_hdr *hdr;
 
         /* First we need a network buffer from the Guests's recv virtqueue. */
         head = get_vq_desc(dev->vq, iov, &out_num, &in_num);
@@ -896,25 +963,23 @@ static bool handle_tun_input(int fd, struct device *dev)
                  * early, the Guest won't be ready yet.  Wait until the device
                  * status says it's ready. */
                 /* FIXME: Actually want DRIVER_ACTIVE here. */
-                if (dev->desc->status & VIRTIO_CONFIG_S_DRIVER_OK)
-                        warn("network: no dma buffer!");
+
+                /* Now tell it we want to know if new things appear. */
+                dev->vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY;
+                wmb();
+
                 /* We'll turn this back on if input buffers are registered. */
                 return false;
         } else if (out_num)
                 errx(1, "Output buffers in network recv queue?");
 
-        /* First element is the header: we set it to 0 (no features). */
-        hdr = convert(&iov[0], struct virtio_net_hdr);
-        hdr->flags = 0;
-        hdr->gso_type = VIRTIO_NET_HDR_GSO_NONE;
-
         /* Read the packet from the device directly into the Guest's buffer. */
-        len = readv(dev->fd, iov+1, in_num-1);
+        len = readv(dev->fd, iov, in_num);
         if (len <= 0)
                 err(1, "reading network");
 
         /* Tell the Guest about the new packet. */
-        add_used_and_trigger(fd, dev->vq, head, sizeof(*hdr) + len);
+        add_used_and_trigger(fd, dev->vq, head, len);
 
         verbose("tun input packet len %i [%02x %02x] (%s)\n", len,
                 ((u8 *)iov[1].iov_base)[0], ((u8 *)iov[1].iov_base)[1],
@@ -927,11 +992,18 @@ static bool handle_tun_input(int fd, struct device *dev)
 /*L:215 This is the callback attached to the network and console input
  * virtqueues: it ensures we try again, in case we stopped console or net
  * delivery because Guest didn't have any buffers. */
-static void enable_fd(int fd, struct virtqueue *vq)
+static void enable_fd(int fd, struct virtqueue *vq, bool timeout)
 {
         add_device_fd(vq->dev->fd);
-        /* Tell waker to listen to it again */
-        write(waker_fd, &vq->dev->fd, sizeof(vq->dev->fd));
+        /* Snap the Waker out of its select loop. */
+        write(waker_fds.pipe[1], "", 1);
+}
+
+static void net_enable_fd(int fd, struct virtqueue *vq, bool timeout)
+{
+        /* We don't need to know again when Guest refills receive buffer. */
+        vq->vring.used->flags |= VRING_USED_F_NO_NOTIFY;
+        enable_fd(fd, vq, timeout);
 }
 
 /* When the Guest tells us they updated the status field, we handle it. */
@@ -951,7 +1023,7 @@ static void update_device_status(struct device *dev)
                 for (vq = dev->vq; vq; vq = vq->next) {
                         memset(vq->vring.desc, 0,
                                vring_size(vq->config.num, getpagesize()));
-                        vq->last_avail_idx = 0;
+                        lg_last_avail(vq) = 0;
                 }
         } else if (dev->desc->status & VIRTIO_CONFIG_S_FAILED) {
                 warnx("Device %s configuration FAILED", dev->name);
@@ -960,10 +1032,10 @@ static void update_device_status(struct device *dev)
 
                 verbose("Device %s OK: offered", dev->name);
                 for (i = 0; i < dev->desc->feature_len; i++)
-                        verbose(" %08x", get_feature_bits(dev)[i]);
+                        verbose(" %02x", get_feature_bits(dev)[i]);
                 verbose(", accepted");
                 for (i = 0; i < dev->desc->feature_len; i++)
-                        verbose(" %08x", get_feature_bits(dev)
+                        verbose(" %02x", get_feature_bits(dev)
                                 [dev->desc->feature_len+i]);
 
                 if (dev->ready)
@@ -1000,7 +1072,7 @@ static void handle_output(int fd, unsigned long addr)
                         if (strcmp(vq->dev->name, "console") != 0)
                                 verbose("Output to %s\n", vq->dev->name);
                         if (vq->handle_output)
-                                vq->handle_output(fd, vq);
+                                vq->handle_output(fd, vq, false);
                         return;
                 }
         }
@@ -1014,6 +1086,29 @@ static void handle_output(int fd, unsigned long addr)
               strnlen(from_guest_phys(addr), guest_limit - addr));
 }
 
+static void handle_timeout(int fd)
+{
+        char buf[32];
+        struct device *i;
+        struct virtqueue *vq;
+
+        /* Clear the pipe */
+        read(timeoutpipe[0], buf, sizeof(buf));
+
+        /* Check each device and virtqueue: flush blocked ones. */
+        for (i = devices.dev; i; i = i->next) {
+                for (vq = i->vq; vq; vq = vq->next) {
+                        if (!vq->blocked)
+                                continue;
+
+                        vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY;
+                        vq->blocked = false;
+                        if (vq->handle_output)
+                                vq->handle_output(fd, vq, true);
+                }
+        }
+}
+
 /* This is called when the Waker wakes us up: check for incoming file
  * descriptors. */
 static void handle_input(int fd)
@@ -1024,16 +1119,20 @@ static void handle_input(int fd)
         for (;;) {
                 struct device *i;
                 fd_set fds = devices.infds;
+                int num;
 
+                num = select(devices.max_infd+1, &fds, NULL, NULL, &poll);
+                /* Could get interrupted */
+                if (num < 0)
+                        continue;
                 /* If nothing is ready, we're done. */
-                if (select(devices.max_infd+1, &fds, NULL, NULL, &poll) == 0)
+                if (num == 0)
                         break;
 
                 /* Otherwise, call the device(s) which have readable file
                  * descriptors and a method of handling them.  */
                 for (i = devices.dev; i; i = i->next) {
                         if (i->handle_input && FD_ISSET(i->fd, &fds)) {
-                                int dev_fd;
                                 if (i->handle_input(fd, i))
                                         continue;
 
@@ -1043,13 +1142,12 @@ static void handle_input(int fd)
                                  * buffers to deliver into.  Console also uses
                                  * it when it discovers that stdin is closed. */
                                 FD_CLR(i->fd, &devices.infds);
-                                /* Tell waker to ignore it too, by sending a
-                                 * negative fd number (-1, since 0 is a valid
-                                 * FD number). */
-                                dev_fd = -i->fd - 1;
-                                write(waker_fd, &dev_fd, sizeof(dev_fd));
                         }
                 }
+
+                /* Is this the timeout fd? */
+                if (FD_ISSET(timeoutpipe[0], &fds))
+                        handle_timeout(fd);
         }
 }
 
@@ -1098,7 +1196,7 @@ static struct lguest_device_desc *new_dev_desc(u16 type)
 /* Each device descriptor is followed by the description of its virtqueues.  We
  * specify how many descriptors the virtqueue is to have. */
 static void add_virtqueue(struct device *dev, unsigned int num_descs,
-                          void (*handle_output)(int fd, struct virtqueue *me))
+                          void (*handle_output)(int, struct virtqueue *, bool))
 {
         unsigned int pages;
         struct virtqueue **i, *vq = malloc(sizeof(*vq));
@@ -1114,6 +1212,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs,
         vq->last_avail_idx = 0;
         vq->dev = dev;
         vq->inflight = 0;
+        vq->blocked = false;
 
         /* Initialize the configuration. */
         vq->config.num = num_descs;
@@ -1246,6 +1345,24 @@ static void setup_console(void)
 }
 /*:*/
 
+static void timeout_alarm(int sig)
+{
+        write(timeoutpipe[1], "", 1);
+}
+
+static void setup_timeout(void)
+{
+        if (pipe(timeoutpipe) != 0)
+                err(1, "Creating timeout pipe");
+
+        if (fcntl(timeoutpipe[1], F_SETFL,
+                  fcntl(timeoutpipe[1], F_GETFL) | O_NONBLOCK) != 0)
+                err(1, "Making timeout pipe nonblocking");
+
+        add_device_fd(timeoutpipe[0]);
+        signal(SIGALRM, timeout_alarm);
+}
+
 /*M:010 Inter-guest networking is an interesting area.  Simplest is to have a
  * --sharenet=<name> option which opens or creates a named pipe.  This can be
  * used to send packets to another guest in a 1:1 manner.
@@ -1264,10 +1381,25 @@ static void setup_console(void)
 
 static u32 str2ip(const char *ipaddr)
 {
-        unsigned int byte[4];
+        unsigned int b[4];
 
-        sscanf(ipaddr, "%u.%u.%u.%u", &byte[0], &byte[1], &byte[2], &byte[3]);
-        return (byte[0] << 24) | (byte[1] << 16) | (byte[2] << 8) | byte[3];
+        if (sscanf(ipaddr, "%u.%u.%u.%u", &b[0], &b[1], &b[2], &b[3]) != 4)
+                errx(1, "Failed to parse IP address '%s'", ipaddr);
+        return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
+}
+
+static void str2mac(const char *macaddr, unsigned char mac[6])
+{
+        unsigned int m[6];
+        if (sscanf(macaddr, "%02x:%02x:%02x:%02x:%02x:%02x",
+                   &m[0], &m[1], &m[2], &m[3], &m[4], &m[5]) != 6)
+                errx(1, "Failed to parse mac address '%s'", macaddr);
+        mac[0] = m[0];
+        mac[1] = m[1];
+        mac[2] = m[2];
+        mac[3] = m[3];
+        mac[4] = m[4];
+        mac[5] = m[5];
 }
 
 /* This code is "adapted" from libbridge: it attaches the Host end of the
@@ -1288,6 +1420,7 @@ static void add_to_bridge(int fd, const char *if_name, const char *br_name)
                 errx(1, "interface %s does not exist!", if_name);
 
         strncpy(ifr.ifr_name, br_name, IFNAMSIZ);
+        ifr.ifr_name[IFNAMSIZ-1] = '\0';
         ifr.ifr_ifindex = ifidx;
         if (ioctl(fd, SIOCBRADDIF, &ifr) < 0)
                 err(1, "can't add %s to bridge %s", if_name, br_name);
@@ -1296,64 +1429,90 @@ static void add_to_bridge(int fd, const char *if_name, const char *br_name)
 /* This sets up the Host end of the network device with an IP address, brings
  * it up so packets will flow, the copies the MAC address into the hwaddr
  * pointer. */
-static void configure_device(int fd, const char *devname, u32 ipaddr,
-                             unsigned char hwaddr[6])
+static void configure_device(int fd, const char *tapif, u32 ipaddr)
 {
         struct ifreq ifr;
         struct sockaddr_in *sin = (struct sockaddr_in *)&ifr.ifr_addr;
 
-        /* Don't read these incantations.  Just cut & paste them like I did! */
         memset(&ifr, 0, sizeof(ifr));
-        strcpy(ifr.ifr_name, devname);
+        strcpy(ifr.ifr_name, tapif);
+
+        /* Don't read these incantations.  Just cut & paste them like I did! */
         sin->sin_family = AF_INET;
         sin->sin_addr.s_addr = htonl(ipaddr);
         if (ioctl(fd, SIOCSIFADDR, &ifr) != 0)
-                err(1, "Setting %s interface address", devname);
+                err(1, "Setting %s interface address", tapif);
         ifr.ifr_flags = IFF_UP;
         if (ioctl(fd, SIOCSIFFLAGS, &ifr) != 0)
-                err(1, "Bringing interface %s up", devname);
+                err(1, "Bringing interface %s up", tapif);
+}
+
+static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6])
+{
+        struct ifreq ifr;
+
+        memset(&ifr, 0, sizeof(ifr));
+        strcpy(ifr.ifr_name, tapif);
 
         /* SIOC stands for Socket I/O Control.  G means Get (vs S for Set
          * above).  IF means Interface, and HWADDR is hardware address.
          * Simple! */
         if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0)
-                err(1, "getting hw address for %s", devname);
+                err(1, "getting hw address for %s", tapif);
         memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6);
 }
 
-/*L:195 Our network is a Host<->Guest network.  This can either use bridging or
- * routing, but the principle is the same: it uses the "tun" device to inject
- * packets into the Host as if they came in from a normal network card.  We
- * just shunt packets between the Guest and the tun device. */
-static void setup_tun_net(const char *arg)
+static int get_tun_device(char tapif[IFNAMSIZ])
 {
-        struct device *dev;
         struct ifreq ifr;
-        int netfd, ipfd;
-        u32 ip;
-        const char *br_name = NULL;
-        struct virtio_net_config conf;
+        int netfd;
+
+        /* Start with this zeroed.  Messy but sure. */
+        memset(&ifr, 0, sizeof(ifr));
 
         /* We open the /dev/net/tun device and tell it we want a tap device.  A
          * tap device is like a tun device, only somehow different.  To tell
          * the truth, I completely blundered my way through this code, but it
          * works now! */
         netfd = open_or_die("/dev/net/tun", O_RDWR);
-        memset(&ifr, 0, sizeof(ifr));
-        ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+        ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR;
         strcpy(ifr.ifr_name, "tap%d");
         if (ioctl(netfd, TUNSETIFF, &ifr) != 0)
                 err(1, "configuring /dev/net/tun");
+
+        if (ioctl(netfd, TUNSETOFFLOAD,
+                  TUN_F_CSUM|TUN_F_TSO4|TUN_F_TSO6|TUN_F_TSO_ECN) != 0)
+                err(1, "Could not set features for tun device");
+
         /* We don't need checksums calculated for packets coming in this
          * device: trust us! */
         ioctl(netfd, TUNSETNOCSUM, 1);
 
+        memcpy(tapif, ifr.ifr_name, IFNAMSIZ);
+        return netfd;
+}
+
+/*L:195 Our network is a Host<->Guest network.  This can either use bridging or
+ * routing, but the principle is the same: it uses the "tun" device to inject
+ * packets into the Host as if they came in from a normal network card.  We
+ * just shunt packets between the Guest and the tun device. */
+static void setup_tun_net(char *arg)
+{
+        struct device *dev;
+        int netfd, ipfd;
+        u32 ip = INADDR_ANY;
+        bool bridging = false;
+        char tapif[IFNAMSIZ], *p;
+        struct virtio_net_config conf;
+
+        netfd = get_tun_device(tapif);
+
         /* First we create a new network device. */
         dev = new_device("net", VIRTIO_ID_NET, netfd, handle_tun_input);
 
         /* Network devices need a receive and a send queue, just like
          * console. */
-        add_virtqueue(dev, VIRTQUEUE_NUM, enable_fd);
+        add_virtqueue(dev, VIRTQUEUE_NUM, net_enable_fd);
         add_virtqueue(dev, VIRTQUEUE_NUM, handle_net_output);
 
         /* We need a socket to perform the magic network ioctls to bring up the
@@ -1364,28 +1523,56 @@ static void setup_tun_net(const char *arg)
 
         /* If the command line was --tunnet=bridge:<name> do bridging. */
         if (!strncmp(BRIDGE_PFX, arg, strlen(BRIDGE_PFX))) {
-                ip = INADDR_ANY;
-                br_name = arg + strlen(BRIDGE_PFX);
-                add_to_bridge(ipfd, ifr.ifr_name, br_name);
-        } else /* It is an IP address to set up the device with */
+                arg += strlen(BRIDGE_PFX);
+                bridging = true;
+        }
+
+        /* A mac address may follow the bridge name or IP address */
+        p = strchr(arg, ':');
+        if (p) {
+                str2mac(p+1, conf.mac);
+                *p = '\0';
+        } else {
+                p = arg + strlen(arg);
+                /* None supplied; query the randomly assigned mac. */
+                get_mac(ipfd, tapif, conf.mac);
+        }
+
+        /* arg is now either an IP address or a bridge name */
+        if (bridging)
+                add_to_bridge(ipfd, tapif, arg);
+        else
                 ip = str2ip(arg);
 
-        /* Set up the tun device, and get the mac address for the interface. */
-        configure_device(ipfd, ifr.ifr_name, ip, conf.mac);
+        /* Set up the tun device. */
+        configure_device(ipfd, tapif, ip);
 
         /* Tell Guest what MAC address to use. */
         add_feature(dev, VIRTIO_NET_F_MAC);
         add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
+        /* Expect Guest to handle everything except UFO */
+        add_feature(dev, VIRTIO_NET_F_CSUM);
+        add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);
+        add_feature(dev, VIRTIO_NET_F_MAC);
+        add_feature(dev, VIRTIO_NET_F_GUEST_TSO4);
+        add_feature(dev, VIRTIO_NET_F_GUEST_TSO6);
+        add_feature(dev, VIRTIO_NET_F_GUEST_ECN);
+        add_feature(dev, VIRTIO_NET_F_HOST_TSO4);
+        add_feature(dev, VIRTIO_NET_F_HOST_TSO6);
+        add_feature(dev, VIRTIO_NET_F_HOST_ECN);
         set_config(dev, sizeof(conf), &conf);
 
         /* We don't need the socket any more; setup is done. */
         close(ipfd);
 
-        verbose("device %u: tun net %u.%u.%u.%u\n",
-                devices.device_num++,
-                (u8)(ip>>24),(u8)(ip>>16),(u8)(ip>>8),(u8)ip);
-        if (br_name)
-                verbose("attached to bridge: %s\n", br_name);
+        devices.device_num++;
+
+        if (bridging)
+                verbose("device %u: tun %s attached to bridge: %s\n",
+                        devices.device_num, tapif, arg);
+        else
+                verbose("device %u: tun %s: %s\n",
+                        devices.device_num, tapif, arg);
 }
 
 /* Our block (disk) device should be really simple: the Guest asks for a block
@@ -1550,7 +1737,7 @@ static bool handle_io_finish(int fd, struct device *dev)
 }
 
 /* When the Guest submits some I/O, we just need to wake the I/O thread. */
-static void handle_virtblk_output(int fd, struct virtqueue *vq)
+static void handle_virtblk_output(int fd, struct virtqueue *vq, bool timeout)
 {
         struct vblk_info *vblk = vq->dev->priv;
         char c = 0;
@@ -1621,6 +1808,64 @@ static void setup_block_file(const char *filename)
         verbose("device %u: virtblock %llu sectors\n",
                 devices.device_num, le64_to_cpu(conf.capacity));
 }
+
+/* Our random number generator device reads from /dev/random into the Guest's
+ * input buffers.  The usual case is that the Guest doesn't want random numbers
+ * and so has no buffers although /dev/random is still readable, whereas
+ * console is the reverse.
+ *
+ * The same logic applies, however. */
+static bool handle_rng_input(int fd, struct device *dev)
+{
+        int len;
+        unsigned int head, in_num, out_num, totlen = 0;
+        struct iovec iov[dev->vq->vring.num];
+
+        /* First we need a buffer from the Guests's virtqueue. */
+        head = get_vq_desc(dev->vq, iov, &out_num, &in_num);
+
+        /* If they're not ready for input, stop listening to this file
+         * descriptor.  We'll start again once they add an input buffer. */
+        if (head == dev->vq->vring.num)
+                return false;
+
+        if (out_num)
+                errx(1, "Output buffers in rng?");
+
+        /* This is why we convert to iovecs: the readv() call uses them, and so
+         * it reads straight into the Guest's buffer.  We loop to make sure we
+         * fill it. */
+        while (!iov_empty(iov, in_num)) {
+                len = readv(dev->fd, iov, in_num);
+                if (len <= 0)
+                        err(1, "Read from /dev/random gave %i", len);
+                iov_consume(iov, in_num, len);
+                totlen += len;
+        }
+
+        /* Tell the Guest about the new input. */
+        add_used_and_trigger(fd, dev->vq, head, totlen);
+
+        /* Everything went OK! */
+        return true;
+}
+
+/* And this creates a "hardware" random number device for the Guest. */
+static void setup_rng(void)
+{
+        struct device *dev;
+        int fd;
+
+        fd = open_or_die("/dev/random", O_RDONLY);
+
+        /* The device responds to return from I/O thread. */
+        dev = new_device("rng", VIRTIO_ID_RNG, fd, handle_rng_input);
+
+        /* The device has one virtqueue, where the Guest places inbufs. */
+        add_virtqueue(dev, VIRTQUEUE_NUM, enable_fd);
+
+        verbose("device %u: rng\n", devices.device_num++);
+}
 /* That's the end of device setup. */
 
 /*L:230 Reboot is pretty easy: clean up and exec() the Launcher afresh. */
@@ -1628,11 +1873,12 @@ static void __attribute__((noreturn)) restart_guest(void)
 {
         unsigned int i;
 
-        /* Closing pipes causes the Waker thread and io_threads to die, and
-         * closing /dev/lguest cleans up the Guest.  Since we don't track all
-         * open fds, we simply close everything beyond stderr. */
+        /* Since we don't track all open fds, we simply close everything beyond
+         * stderr. */
         for (i = 3; i < FD_SETSIZE; i++)
                 close(i);
+
+        /* The exec automatically gets rid of the I/O and Waker threads. */
         execv(main_args[0], main_args);
         err(1, "Could not exec %s", main_args[0]);
 }
@@ -1663,7 +1909,7 @@ static void __attribute__((noreturn)) run_guest(int lguest_fd)
                 /* ERESTART means that we need to reboot the guest */
                 } else if (errno == ERESTART) {
                         restart_guest();
-                /* EAGAIN means the Waker wanted us to look at some input.
+                /* EAGAIN means a signal (timeout).
                  * Anything else means a bug or incompatible change. */
                 } else if (errno != EAGAIN)
                         err(1, "Running guest failed");
@@ -1691,13 +1937,14 @@ static struct option opts[] = {
         { "verbose", 0, NULL, 'v' },
         { "tunnet", 1, NULL, 't' },
         { "block", 1, NULL, 'b' },
+        { "rng", 0, NULL, 'r' },
         { "initrd", 1, NULL, 'i' },
         { NULL },
 };
 static void usage(void)
 {
         errx(1, "Usage: lguest [--verbose] "
-             "[--tunnet=(<ipaddr>|bridge:<bridgename>)\n"
+             "[--tunnet=(<ipaddr>:<macaddr>|bridge:<bridgename>:<macaddr>)\n"
              "|--block=<filename>|--initrd=<filename>]...\n"
              "<mem-in-mb> vmlinux [args...]");
 }
@@ -1765,6 +2012,9 @@ int main(int argc, char *argv[])
                 case 'b':
                         setup_block_file(optarg);
                         break;
+                case 'r':
+                        setup_rng();
+                        break;
                 case 'i':
                         initrd_name = optarg;
                         break;
@@ -1783,6 +2033,9 @@ int main(int argc, char *argv[])
         /* We always have a console device */
         setup_console();
 
+        /* We can timeout waiting for Guest network transmit. */
+        setup_timeout();
+
         /* Now we load the kernel */
         start = load_kernel(open_or_die(argv[optind+1], O_RDONLY));
 
@@ -1826,10 +2079,10 @@ int main(int argc, char *argv[])
          * /dev/lguest file descriptor. */
         lguest_fd = tell_kernel(pgdir, start);
 
-        /* We fork off a child process, which wakes the Launcher whenever one
-         * of the input file descriptors needs attention.  We call this the
-         * Waker, and we'll cover it in a moment. */
-        waker_fd = setup_waker(lguest_fd);
+        /* We clone off a thread, which wakes the Launcher whenever one of the
+         * input file descriptors needs attention.  We call this the Waker, and
+         * we'll cover it in a moment. */
+        setup_waker(lguest_fd);
 
         /* Finally, run the Guest.  This doesn't return. */
         run_guest(lguest_fd);
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 72aff61e7315..6f6d117ac7e2 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1024,6 +1024,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           intel-mac-v3  Intel Mac Type 3
           intel-mac-v4  Intel Mac Type 4
           intel-mac-v5  Intel Mac Type 5
+          intel-mac-auto Intel Mac (detect type according to subsystem id)
           macmini       Intel Mac Mini (equivalent with type 3)
           macbook       Intel Mac Book (eq. type 5)
           macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)
diff --git a/Documentation/sparse.txt b/Documentation/sparse.txt
index 1a3bdc27d95e..42f43fa59f24 100644
--- a/Documentation/sparse.txt
+++ b/Documentation/sparse.txt
@@ -73,10 +73,10 @@ recompiled, or use "make C=2" to run sparse on the files whether they need to
 be recompiled or not.  The latter is a fast way to check the whole tree if you
 have already built it.
 
-The optional make variable CHECKFLAGS can be used to pass arguments to sparse.
-The build system passes -Wbitwise to sparse automatically.  To perform
-endianness checks, you may define __CHECK_ENDIAN__:
+The optional make variable CF can be used to pass arguments to sparse.  The
+build system passes -Wbitwise to sparse automatically.  To perform endianness
+checks, you may define __CHECK_ENDIAN__:
 
-        make C=2 CHECKFLAGS="-D__CHECK_ENDIAN__"
+        make C=2 CF="-D__CHECK_ENDIAN__"
 
 These checks are disabled by default as they generate a host of warnings.
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828
index 86d1c8e7b18f..eedc399e8deb 100644
--- a/Documentation/video4linux/CARDLIST.au0828
+++ b/Documentation/video4linux/CARDLIST.au0828
@@ -2,3 +2,4 @@
   1 -> Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]
   2 -> Hauppauge HVR850                         (au0828)        [2040:7240]
   3 -> DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]
+  4 -> Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 10591467ef16..89c7f32abf9f 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -1,11 +1,11 @@
   0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]
-  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
   2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]
   3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]
   4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]
   5 -> MSI VOX USB 2.0                          (em2820/em2840)
   6 -> Terratec Cinergy 200 USB                 (em2800)
-  7 -> Leadtek Winfast USB II                   (em2800)
+  7 -> Leadtek Winfast USB II                   (em2800)        [0413:6023]
   8 -> Kworld USB2800                           (em2800)
   9 -> Pinnacle Dazzle DVC 90/DVC 100           (em2820/em2840) [2304:0207,2304:021a]
  10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]
@@ -14,7 +14,46 @@
  13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]
  14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)
  15 -> V-Gear PocketTV                          (em2800)
- 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513,2040:6517,2040:651b,2040:651f]
+ 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]
  17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]
  18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]
  19 -> PointNix Intra-Oral Camera               (em2860)
+ 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]
+ 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]
+ 22 -> Unknown EM2750/EM2751 webcam grabber     (em2750)        [eb1a:2750,eb1a:2751]
+ 23 -> Huaqi DLCW-130                           (em2750)
+ 24 -> D-Link DUB-T210 TV Tuner                 (em2820/em2840) [2001:f112]
+ 25 -> Gadmei UTV310                            (em2820/em2840)
+ 26 -> Hercules Smart TV USB 2.0                (em2820/em2840)
+ 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME)   (em2820/em2840)
+ 28 -> Leadtek Winfast USB II Deluxe            (em2820/em2840)
+ 29 -> Pinnacle Dazzle DVC 100                  (em2820/em2840)
+ 30 -> Videology 20K14XUSB USB2.0               (em2820/em2840)
+ 31 -> Usbgear VD204v9                          (em2821)
+ 32 -> Supercomp USB 2.0 TV                     (em2821)
+ 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0  (em2821)
+ 34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]
+ 35 -> Typhoon DVD Maker                        (em2860)
+ 36 -> NetGMBH Cam                              (em2860)
+ 37 -> Gadmei UTV330                            (em2860)
+ 38 -> Yakumo MovieMixer                        (em2861)
+ 39 -> KWorld PVRTV 300U                        (em2861)        [eb1a:e300]
+ 40 -> Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]
+ 41 -> Kworld 350 U DVB-T                       (em2870)        [eb1a:e350]
+ 42 -> Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357]
+ 43 -> Terratec Cinergy T XS                    (em2870)        [0ccd:0043]
+ 44 -> Terratec Cinergy T XS (MT2060)           (em2870)
+ 45 -> Pinnacle PCTV DVB-T                      (em2870)
+ 46 -> Compro, VideoMate U3                     (em2870)        [185b:2870]
+ 47 -> KWorld DVB-T 305U                        (em2880)        [eb1a:e305]
+ 48 -> KWorld DVB-T 310U                        (em2880)
+ 49 -> MSI DigiVox A/D                          (em2880)        [eb1a:e310]
+ 50 -> MSI DigiVox A/D II                       (em2880)        [eb1a:e320]
+ 51 -> Terratec Hybrid XS Secam                 (em2880)        [0ccd:004c]
+ 52 -> DNT DA2 Hybrid                           (em2881)
+ 53 -> Pinnacle Hybrid Pro                      (em2881)
+ 54 -> Kworld VS-DVB-T 323UR                    (em2882)        [eb1a:e323]
+ 55 -> Terratec Hybrid XS (em2882)              (em2882)        [0ccd:005e]
+ 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]
+ 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]
+ 58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 0c4880af57a3..bcaf4ab383be 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -1,4 +1,4 @@
-List of the webcams know by gspca.
+List of the webcams known by gspca.
 
 The modules are:
         gspca_main      main driver
diff --git a/Kbuild b/Kbuild
index e750e9c3fe59..f056b4feee51 100644
--- a/Kbuild
+++ b/Kbuild
@@ -43,7 +43,7 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
 # 2) Generate asm-offsets.h
 #
 
-offsets-file := include/asm-$(SRCARCH)/asm-offsets.h
+offsets-file := include/asm/asm-offsets.h
 
 always  += $(offsets-file)
 targets += $(offsets-file)
@@ -81,7 +81,6 @@ arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \
         $(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild
-        $(Q)mkdir -p $(dir $@)
         $(call cmd,offsets)
 
 #####
diff --git a/MAINTAINERS b/MAINTAINERS
index 03c5d6ccb9f8..deedc0d827b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3796,6 +3796,12 @@ P:	Ben Nizette
 M:      bn@niasdigital.com
 S:      Maintained
 
+SOC-CAMERA V4L2 SUBSYSTEM
+P:     Guennadi Liakhovetski
+M:     g.liakhovetski@gmx.de
+L:     video4linux-list@redhat.com
+S:     Maintained
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:      Ingo Molnar
 M:      mingo@redhat.com
diff --git a/Makefile b/Makefile
index 3cad7db5eba7..aa527a46c807 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 26
-EXTRAVERSION =
+SUBLEVEL = 27
+EXTRAVERSION = -rc1
 NAME = Rotary Wombat
 
 # *DOCUMENTATION*
@@ -205,6 +205,13 @@ ifeq ($(ARCH),x86_64)
         SRCARCH := x86
 endif
 
+# Where to locate arch specific headers
+ifeq ($(ARCH),sparc64)
+       hdr-arch  := sparc
+else
+       hdr-arch  := $(SRCARCH)
+endif
+
 KCONFIG_CONFIG  ?= .config
 
 # SHELL used by kbuild
@@ -326,7 +333,8 @@ AFLAGS_KERNEL	=
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -Iinclude \
                    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
-                   -include include/linux/autoconf.h
+                   -I$(srctree)/arch/$(hdr-arch)/include               \
+                   -include include/linux/autoconf.h
 
 KBUILD_CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
 
@@ -922,7 +930,9 @@ ifneq ($(KBUILD_SRC),)
                 /bin/false; \
         fi;
         $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-        $(Q)ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm
+        $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/system.h ]; then  \
+            ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
+            fi
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -948,22 +958,34 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
 
 # The asm symlink changes when $(ARCH) changes.
 # Detect this and ask user to run make mrproper
-
-include/asm: FORCE
-        $(Q)set -e; asmlink=`readlink include/asm | cut -d '-' -f 2`;   \
-        if [ -L include/asm ]; then                                     \
-                if [ "$$asmlink" != "$(SRCARCH)" ]; then                \
+define check-symlink
+        set -e;                                                            \
+        if [ -L include/asm ]; then                                        \
+                asmlink=`readlink include/asm | cut -d '-' -f 2`;          \
+                if [ "$$asmlink" != "$(SRCARCH)" ]; then                   \
                         echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected"; \
                         echo "       set ARCH or save .config and run 'make mrproper' to fix it";             \
-                        exit 1;                                         \
-                fi;                                                     \
-        else                                                            \
-                echo '  SYMLINK $@ -> include/asm-$(SRCARCH)';          \
-                if [ ! -d include ]; then                               \
-                        mkdir -p include;                               \
-                fi;                                                     \
-                ln -fsn asm-$(SRCARCH) $@;                              \
+                        exit 1;                                            \
+                fi;                                                        \
         fi
+endef
+
+# We create the target directory of the symlink if it does
+# not exist so the test in chack-symlink works and we have a
+# directory for generated filesas used by some architectures.
+define create-symlink
+        if [ ! -L include/asm ]; then                                      \
+                        echo '  SYMLINK $@ -> include/asm-$(SRCARCH)';     \
+                        if [ ! -d include/asm-$(SRCARCH) ]; then           \
+                                mkdir -p include/asm-$(SRCARCH);           \
+                        fi;                                                \
+                        ln -fsn asm-$(SRCARCH) $@;                         \
+        fi
+endef
+
+include/asm: FORCE
+        $(Q)$(check-symlink)
+        $(Q)$(create-symlink)
 
 # Generate some files
 # ---------------------------------------------------------------------------
@@ -1010,36 +1032,43 @@ firmware_install: FORCE
 
 # ---------------------------------------------------------------------------
 # Kernel headers
-INSTALL_HDR_PATH=$(objtree)/usr
-export INSTALL_HDR_PATH
 
-HDRFILTER=generic i386 x86_64
-HDRARCHES=$(filter-out $(HDRFILTER),$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
+#Default location for installed headers
+export INSTALL_HDR_PATH = $(objtree)/usr
 
-PHONY += headers_install_all
-headers_install_all: include/linux/version.h scripts_basic FORCE
+hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+# Find out where the Kbuild file is located to support
+# arch/$(ARCH)/include/asm
+hdr-dir = $(strip                                                         \
+          $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild), \
+               arch/$(hdr-arch)/include/asm, include/asm-$(hdr-arch)))
+
+# If we do an all arch process set dst to asm-$(hdr-arch)
+hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
+
+PHONY += __headers
+__headers: include/linux/version.h scripts_basic FORCE
         $(Q)$(MAKE) $(build)=scripts scripts/unifdef
-        $(Q)for arch in $(HDRARCHES); do \
-         $(MAKE) ARCH=$$arch -f $(srctree)/scripts/Makefile.headersinst obj=include BIASMDIR=-bi-$$arch ;\
-         done
+
+PHONY += headers_install_all
+headers_install_all:
+        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/headers.sh install
 
 PHONY += headers_install
-headers_install: include/linux/version.h scripts_basic FORCE
-        @if [ ! -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
-          echo '*** Error: Headers not exportable for this architecture ($(SRCARCH))'; \
-          exit 1 ; fi
-        $(Q)$(MAKE) $(build)=scripts scripts/unifdef
-        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include
+headers_install: __headers
+        $(if $(wildcard $(srctree)/$(hdr-dir)/Kbuild),, \
+        $(error Headers not exportable for the $(SRCARCH) architecture))
+        $(Q)$(MAKE) $(hdr-inst)=include
+        $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst)
 
 PHONY += headers_check_all
 headers_check_all: headers_install_all
-        $(Q)for arch in $(HDRARCHES); do \
-         $(MAKE) ARCH=$$arch -f $(srctree)/scripts/Makefile.headersinst obj=include BIASMDIR=-bi-$$arch HDRCHECK=1 ;\
-         done
+        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/headers.sh check
 
 PHONY += headers_check
 headers_check: headers_install
-        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include HDRCHECK=1
+        $(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1
+        $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst) HDRCHECK=1
 
 # ---------------------------------------------------------------------------
 # Modules
@@ -1131,7 +1160,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/linux/autoconf.h include/linux/version.h      \
                   include/linux/utsrelease.h                            \
                   include/linux/bounds.h include/asm*/asm-offsets.h     \
-                  Module.symvers tags TAGS cscope*
+                  Module.symvers Module.markers tags TAGS cscope*
 
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1150,7 +1179,7 @@ clean: archclean $(clean-dirs)
                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
                 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
                 -o -name '*.symtypes' -o -name 'modules.order' \
-                -o -name 'Module.markers' \) \
+                -o -name 'Module.markers' -o -name '.tmp_*.o.*' \) \
                 -type f -print | xargs rm -f
 
 # mrproper - Delete all generated files, including .config
@@ -1224,21 +1253,17 @@ help:
         @echo  '  cscope          - Generate cscope index'
         @echo  '  kernelrelease   - Output the release version string'
         @echo  '  kernelversion   - Output the version stored in Makefile'
-        @if [ -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
-         echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
+        @echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
          echo  '                    (default: $(INSTALL_HDR_PATH))'; \
-         fi
-        @echo  ''
+         echo  ''
         @echo  'Static analysers'
         @echo  '  checkstack      - Generate a list of stack hogs'
         @echo  '  namespacecheck  - Name space analysis on compiled kernel'
         @echo  '  versioncheck    - Sanity check on version.h usage'
         @echo  '  includecheck    - Check for duplicate included header files'
         @echo  '  export_report   - List the usages of all exported symbols'
-        @if [ -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
-         echo  '  headers_check   - Sanity check on exported headers'; \
-         fi
-        @echo  ''
+        @echo  '  headers_check   - Sanity check on exported headers'; \
+         echo  ''
         @echo  'Kernel packaging:'
         @$(MAKE) $(build)=$(package-dir) help
         @echo  ''
@@ -1411,7 +1436,11 @@ define find-sources
                \( -name config -o -name 'asm-*' \) -prune \
                -o -name $1 -print; \
           for arch in $(ALLINCLUDE_ARCHS) ; do \
-               find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
+               test -e $(__srctree)include/asm-$${arch} && \
+                 find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
+                    -name $1 -print; \
+               test -e $(__srctree)arch/$${arch}/include/asm && \
+                 find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \
                     -name $1 -print; \
           done ; \
           find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dabb015aa40b..257033c691f2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,6 +17,7 @@ config ARM
         select HAVE_KRETPROBES if (HAVE_KPROBES)
         select HAVE_FTRACE if (!XIP_KERNEL)
         select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
+        select HAVE_GENERIC_DMA_COHERENT
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -234,6 +235,7 @@ config ARCH_VERSATILE
 config ARCH_AT91
         bool "Atmel AT91"
         select GENERIC_GPIO
+        select HAVE_CLK
         help
           This enables support for systems based on the Atmel AT91RM9200,
           AT91SAM9 and AT91CAP9 processors.
@@ -267,7 +269,6 @@ config ARCH_EP93XX
         select ARM_VIC
         select GENERIC_GPIO
         select HAVE_CLK
-        select HAVE_CLK
         select ARCH_REQUIRE_GPIOLIB
         help
           This enables support for the Cirrus EP93xx series of CPUs.
@@ -314,7 +315,7 @@ config ARCH_IOP32X
         select PLAT_IOP
         select PCI
         select GENERIC_GPIO
-        select HAVE_GPIO_LIB
+        select ARCH_REQUIRE_GPIOLIB
         help
           Support for Intel's 80219 and IOP32X (XScale) family of
           processors.
@@ -325,7 +326,7 @@ config ARCH_IOP33X
         select PLAT_IOP
         select PCI
         select GENERIC_GPIO
-        select HAVE_GPIO_LIB
+        select ARCH_REQUIRE_GPIOLIB
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
@@ -418,7 +419,7 @@ config ARCH_MXC
         select GENERIC_CLOCKEVENTS
         select ARCH_MTD_XIP
         select GENERIC_GPIO
-        select HAVE_GPIO_LIB
+        select ARCH_REQUIRE_GPIOLIB
         help
           Support for Freescale MXC/iMX-based family of processors
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index b20995a82e04..2f0747744236 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -67,7 +67,7 @@ tune-$(CONFIG_CPU_ARM720T)	:=-mtune=arm7tdmi
 tune-$(CONFIG_CPU_ARM740T)      :=-mtune=arm7tdmi
 tune-$(CONFIG_CPU_ARM9TDMI)     :=-mtune=arm9tdmi
 tune-$(CONFIG_CPU_ARM940T)      :=-mtune=arm9tdmi
-tune-$(CONFIG_CPU_ARM946T)      :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
+tune-$(CONFIG_CPU_ARM946E)      :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
 tune-$(CONFIG_CPU_ARM920T)      :=-mtune=arm9tdmi
 tune-$(CONFIG_CPU_ARM922T)      :=-mtune=arm9tdmi
 tune-$(CONFIG_CPU_ARM925T)      :=-mtune=arm9tdmi
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index c3c3a3339049..85579654d3b7 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type)
 
         mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);
 
-        if (type == IRQT_PROBE) {
+        if (type == IRQ_TYPE_PROBE) {
                 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
                         return 0;
-                type = __IRQT_RISEDGE | __IRQT_FALEDGE;
+                type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
-        if (type & __IRQT_RISEDGE)
+        if (type & IRQ_TYPE_EDGE_RISING)
                 GPIO_IRQ_rising_edge |= mask;
         else
                 GPIO_IRQ_rising_edge &= ~mask;
-        if (type & __IRQT_FALEDGE)
+        if (type & IRQ_TYPE_EDGE_FALLING)
                 GPIO_IRQ_falling_edge |= mask;
         else
                 GPIO_IRQ_falling_edge &= ~mask;
@@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip)
         /*
          * Install handler for IRQ_LOCOMO_HW.
          */
-        set_irq_type(lchip->irq, IRQT_FALLING);
+        set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);
         set_irq_chip_data(lchip->irq, irqbase);
         set_irq_chained_handler(lchip->irq, locomo_handler);
 
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 0a8e1ff2af8a..f6d3fdda7067 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
         void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
 
-        if (flags == IRQT_PROBE)
+        if (flags == IRQ_TYPE_PROBE)
                 return 0;
 
-        if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)
+        if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
                 return -EINVAL;
 
         ip0 = sa1111_readl(mapbase + SA1111_INTPOL0);
-        if (flags & __IRQT_RISEDGE)
+        if (flags & IRQ_TYPE_EDGE_RISING)
                 ip0 &= ~mask;
         else
                 ip0 |= mask;
@@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
         void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
 
-        if (flags == IRQT_PROBE)
+        if (flags == IRQ_TYPE_PROBE)
                 return 0;
 
-        if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)
+        if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
                 return -EINVAL;
 
         ip1 = sa1111_readl(mapbase + SA1111_INTPOL1);
-        if (flags & __IRQT_RISEDGE)
+        if (flags & IRQ_TYPE_EDGE_RISING)
                 ip1 &= ~mask;
         else
                 ip1 |= mask;
@@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
         /*
          * Register SA1111 interrupt
          */
-        set_irq_type(sachip->irq, IRQT_RISING);
+        set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
         set_irq_data(sachip->irq, irqbase);
         set_irq_chained_handler(sachip->irq, sa1111_irq_handler);
 }
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig
index 493ecee24f94..2307587a38a9 100644
--- a/arch/arm/configs/eseries_pxa_defconfig
+++ b/arch/arm/configs/eseries_pxa_defconfig
@@ -1,15 +1,19 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Fri Nov  9 20:23:03 2007
+# Linux kernel version: 2.6.26
+# Sat Jul 26 22:28:46 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -18,75 +22,90 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_KALLSYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
+# CONFIG_HAVE_IOREMAP_PROT is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_ARCH_TRACEHOOK is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+CONFIG_HAVE_CLK=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
@@ -100,6 +119,7 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
 
 #
 # System Type
@@ -111,21 +131,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
@@ -133,80 +158,48 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_BOARD_IRQ_MAP_SMALL is not set
-CONFIG_BOARD_IRQ_MAP_BIG=y
-CONFIG_DMABOUNCE=y
+# CONFIG_ARCH_MSM7X00A is not set
 
 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
+# CONFIG_ARCH_GUMSTIX is not set
 # CONFIG_ARCH_LUBBOCK is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
-CONFIG_TOSHIBA_TMIO_OHCI=y
-CONFIG_ARCH_ESERIES=y
+# CONFIG_PXA_SHARPSL is not set
+CONFIG_ARCH_PXA_ESERIES=y
 CONFIG_MACH_E330=y
+CONFIG_MACH_E350=y
 CONFIG_MACH_E740=y
 CONFIG_MACH_E750=y
 CONFIG_MACH_E400=y
 CONFIG_MACH_E800=y
-CONFIG_E330_LCD=y
-CONFIG_E740_LCD=y
-CONFIG_E750_LCD=y
-CONFIG_E400_LCD=y
-CONFIG_E800_LCD=y
-CONFIG_ESERIES_UDC=y
-CONFIG_E330_TC6387XB=y
-CONFIG_E740_T7L66XB=y
-CONFIG_E400_T7L66XB=y
-CONFIG_E750_E800_TC6393XB=y
-CONFIG_E740_PCMCIA=m
-CONFIG_E750_PCMCIA=m
-CONFIG_E800_PCMCIA=m
-# CONFIG_MACH_A620 is not set
-# CONFIG_MACH_A716 is not set
-# CONFIG_MACH_A730 is not set
-# CONFIG_ARCH_H1900 is not set
-# CONFIG_ARCH_H2200 is not set
-# CONFIG_MACH_H3900 is not set
-# CONFIG_MACH_H4000 is not set
-# CONFIG_MACH_H4700 is not set
-# CONFIG_MACH_HX2750 is not set
-# CONFIG_ARCH_H5400 is not set
-# CONFIG_MACH_HIMALAYA is not set
-# CONFIG_MACH_HTCUNIVERSAL is not set
-# CONFIG_MACH_HTCALPINE is not set
-# CONFIG_MACH_MAGICIAN is not set
-# CONFIG_MACH_HTCAPACHE is not set
-# CONFIG_MACH_BLUEANGEL is not set
-
-#
-# HTC_HW6X00
-#
-# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_MACH_HW6900 is not set
-# CONFIG_MACH_HTCATHENA is not set
-# CONFIG_ARCH_AXIMX3 is not set
-# CONFIG_ARCH_AXIMX5 is not set
-# CONFIG_MACH_X50 is not set
-# CONFIG_ARCH_ROVERP1 is not set
-# CONFIG_ARCH_ROVERP5P is not set
-# CONFIG_MACH_XSCALE_PALMLD is not set
-# CONFIG_MACH_T3XSCALE is not set
-# CONFIG_MACH_RECON is not set
-# CONFIG_MACH_GHI270HG is not set
-# CONFIG_MACH_GHI270 is not set
-# CONFIG_MACH_LOOXC550 is not set
-# CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_COLIBRI is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_LITTLETON is not set
+# CONFIG_MACH_TAVOREVB is not set
+# CONFIG_MACH_SAAR is not set
+# CONFIG_MACH_ARMCORE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_PCM027 is not set
+# CONFIG_ARCH_PXA_PALM is not set
+# CONFIG_PXA_EZX is not set
 CONFIG_PXA25x=y
+# CONFIG_PXA_PWM is not set
+
+#
+# Boot options
+#
 
 #
-# Linux As Bootloader
+# Power management
 #
-# CONFIG_LAB is not set
 
 #
 # Processor Type
@@ -215,6 +208,7 @@ CONFIG_CPU_32=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_CP15=y
@@ -232,11 +226,9 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=m
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -245,11 +237,14 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # PC-card bridges
 #
-CONFIG_PCMCIA_PXA2XX=m
 
 #
 # Kernel Features
 #
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -262,9 +257,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -275,7 +274,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
-# CONFIG_TXTOFFSET_DELTA is not set
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -304,11 +303,12 @@ CONFIG_BINFMT_MISC=y
 # Power management options
 #
 CONFIG_PM=y
-CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_DPM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
 # CONFIG_APM_EMULATION is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
 # Networking
@@ -318,13 +318,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -339,35 +339,40 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -380,10 +385,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -391,15 +392,74 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=y
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_PXA_FICP=y
+# CONFIG_MCS_FIR is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+CONFIG_MAC80211_RC_DEFAULT="pid"
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -408,38 +468,32 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_PARTITIONS is not set
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_CHAR is not set
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -459,7 +513,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -482,82 +535,43 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_H1900 is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-
-#
-# OneNAND Flash Device Drivers
-#
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=6144
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=m
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=m
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_PROC_FS is not set
@@ -565,7 +579,7 @@ CONFIG_SCSI=m
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_BLK_DEV_SD is not set
+CONFIG_BLK_DEV_SD=m
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
@@ -579,6 +593,7 @@ CONFIG_SCSI=m
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -586,132 +601,78 @@ CONFIG_SCSI=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_SATA_PMP is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_MV is not set
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
+# CONFIG_VETH is not set
 # CONFIG_NET_ETHERNET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
+# CONFIG_LIBERTAS is not set
+CONFIG_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+# CONFIG_PCMCIA_SPECTRUM is not set
 # CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_USB_ZD1201 is not set
-CONFIG_HOSTAP=m
-# CONFIG_HOSTAP_FIRMWARE is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_ACX is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_RT2X00 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=m
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
@@ -719,38 +680,48 @@ CONFIG_NET_WIRELESS=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_TSDEV=m
-CONFIG_INPUT_TSDEV_SCREEN_X=240
-CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_LED_TRIGGER is not set
 
 #
 # Input Device Drivers
 #
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_KEYBOARD_GPIO=m
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -763,9 +734,11 @@ CONFIG_TOUCHSCREEN_WM9713=y
 # Character devices
 #
 CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -777,25 +750,12 @@ CONFIG_HW_CONSOLE=y
 # Non-8250 serial port support
 #
 # CONFIG_SERIAL_PXA is not set
-# CONFIG_RS232_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-# CONFIG_SA1100_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-# CONFIG_TIHTC is not set
 
 #
 # PCMCIA character devices
@@ -803,117 +763,79 @@ CONFIG_HW_RANDOM=m
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
+# CONFIG_IPWIRELESS is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
-
-#
-# SPI support
-#
 # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_SYSFS is not set
 
 #
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_POWER_SUPPLY is not set
-
-#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-
-#
-# Misc devices
+# I2C GPIO expanders:
 #
 
 #
-# Multimedia Capabilities Port drivers
+# PCI GPIO expanders:
 #
-# CONFIG_ADC is not set
 
 #
-# Compaq/iPAQ Drivers
+# SPI GPIO expanders:
 #
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Compaq/HP iPAQ Drivers
+# Sonics Silicon Backplane
 #
-# CONFIG_IPAQ_SLEEVE is not set
-# CONFIG_SLEEVE_DEBUG is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_BBKEYS is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_SOC_MQ11XX is not set
-CONFIG_SOC_T7L66XB=y
-# CONFIG_SOC_TC6387XB is not set
-CONFIG_SOC_TC6393XB=y
-# CONFIG_SOC_TSC2101 is not set
-# CONFIG_SOC_TSC2200 is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
+# CONFIG_HTC_PASIC3 is not set
+CONFIG_MFD_TC6393XB=y
 
 #
-# LED Triggers
+# Multimedia devices
 #
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 
 #
-# Multimedia devices
+# Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia drivers
 #
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_DAB is not set
 
 #
 # Graphics support
 #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -923,14 +845,25 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # Frame buffer hardware drivers
 #
-# CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_SMARTPANEL is not set
 # CONFIG_FB_PXA_PARAMETERS is not set
 # CONFIG_FB_MBX is not set
 CONFIG_FB_W100=y
+# CONFIG_FB_AM200EPD is not set
 # CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VSFB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -938,6 +871,7 @@ CONFIG_FB_W100=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -945,28 +879,13 @@ CONFIG_FONTS=y
 # CONFIG_FONT_6x11 is not set
 # CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
-CONFIG_FONT_ACORN_8x8=y
-# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
+# CONFIG_LOGO is not set
 CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -980,125 +899,75 @@ CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VERBOSE_PRINTK=y
 # CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
+CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
-
-#
-# ALSA ARM devices
-#
+CONFIG_SND_ARM=y
 # CONFIG_SND_PXA2XX_AC97 is not set
-# CONFIG_SND_RECON is not set
-
-#
-# USB devices
-#
-# CONFIG_SND_USB_AUDIO is not set
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_PDAUDIOCF is not set
-
-#
-# SoC audio support
-#
-CONFIG_SND_SOC_AC97_BUS=y
+# CONFIG_SND_USB is not set
+# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_SOC=m
-
-#
-# SoC Platforms
-#
-
-#
-# SoC Audio for the Atmel AT91
-#
-
-#
-# SoC Audio for the Intel PXA2xx
-#
+CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_PXA2XX_SOC=m
 CONFIG_SND_PXA2XX_SOC_AC97=m
-CONFIG_SND_PXA2XX_SOC_E740_WM9705=m
-CONFIG_SND_PXA2XX_SOC_E750_WM9705=m
-CONFIG_SND_PXA2XX_SOC_E800_WM9712=m
-# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set
-# CONFIG_SND_PXA2XX_SOC_BLUEANGEL is not set
-# CONFIG_SND_PXA2XX_SOC_H5000 is not set
-
-#
-# SoC Audio for the Freescale i.MX
-#
-
-#
-# SoC Audio for the Samsung S3C24XX
-#
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8772 is not set
-# CONFIG_SND_SOC_WM8971 is not set
-# CONFIG_SND_SOC_WM8956 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8976 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8980 is not set
-CONFIG_SND_SOC_WM9705=m
-# CONFIG_SND_SOC_WM9713 is not set
+CONFIG_SND_PXA2XX_SOC_E800=m
 CONFIG_SND_SOC_WM9712=m
-# CONFIG_SND_SOC_UDA1380 is not set
-# CONFIG_SND_SOC_AK4535 is not set
-
-#
-# Open Sound System
-#
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# HID Devices
+# USB Input Devices
 #
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 
 #
-# USB support
+# USB HID Boot Protocol drivers
 #
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 CONFIG_USB=m
-CONFIG_USB_DEBUG=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
 
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
 #
 # USB Host Controller Drivers
 #
+# CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
 #
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1107,68 +976,19 @@ CONFIG_USB_DYNAMIC_MINORS=y
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_MON is not set
+CONFIG_USB_MON=y
 
 #
 # USB port drivers
 #
-
-#
-# USB Serial Converter support
-#
 # CONFIG_USB_SERIAL is not set
 
 #
@@ -1192,56 +1012,57 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
+# CONFIG_USB_ISIGHTFW is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
-CONFIG_USB_GADGET_PXA2XX=y
-CONFIG_USB_PXA2XX=y
-# CONFIG_USB_PXA2XX_SMALL is not set
+CONFIG_USB_GADGET_PXA25X=y
+CONFIG_USB_PXA25X=y
+CONFIG_USB_PXA25X_SMALL=y
+# CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_PXA27X is not set
 # CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_MQ11XX is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_RNDIS is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_CHAR is not set
-# CONFIG_USB_PXA2XX_GPIO is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
-# MMC/SD Card support
+# MMC/SD Card Drivers
 #
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_PXA is not set
-CONFIG_MMC_TMIO=y
-# CONFIG_MMC_SAMCOP is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
 
 #
-# Real Time Clock
+# MMC/SD Host Controller Drivers
 #
+# CONFIG_MMC_PXA is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_NEW_LEDS is not set
 CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1255,14 +1076,11 @@ CONFIG_EXT2_FS=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -1292,7 +1110,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1305,30 +1122,21 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -1341,7 +1149,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1363,10 +1170,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1407,30 +1211,32 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
 
 #
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_FRAME_POINTER=y
+# CONFIG_LATENCYTOP is not set
+CONFIG_HAVE_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+# CONFIG_FTRACE is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_DEBUG_USER is not set
 
 #
@@ -1438,61 +1244,102 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
 
 #
-# Cryptographic options
+# Crypto core or helper
 #
-CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
 # CONFIG_CRYPTO_SHA1 is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
 
 #
-# Hardware crypto devices
+# Compression
 #
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index a1c41d7c0be9..117cf6c9afce 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -330,10 +330,10 @@ static void __init cap9adk_board_init(void)
         /* Serial */
         at91_add_device_serial();
         /* USB Host */
-        set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);
+        set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH);
         at91_add_device_usbh(&cap9adk_usbh_data);
         /* USB HS */
-        set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH);
+        set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH);
         at91_add_device_usba(&cap9adk_usba_udc_data);
         /* SPI */
         at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
@@ -350,7 +350,7 @@ static void __init cap9adk_board_init(void)
         /* I2C */
         at91_add_device_i2c(NULL, 0);
         /* LCD Controller */
-        set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH);
+        set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH);
         at91_add_device_lcdc(&cap9adk_lcdc_data);
         /* AC97 */
         at91_add_device_ac97(&cap9adk_ac97_data);
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index bbbfd06f5e0c..bbbfd06f5e0c 100755..100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c
index 78a5cdb746dc..ca87587b2b4b 100644
--- a/arch/arm/mach-at91/irq.c
+++ b/arch/arm/mach-at91/irq.c
@@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type)
         unsigned int smr, srctype;
 
         switch (type) {
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 srctype = AT91_AIC_SRCTYPE_HIGH;
                 break;
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 srctype = AT91_AIC_SRCTYPE_RISING;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))         /* only supported on external interrupts */
                         srctype = AT91_AIC_SRCTYPE_LOW;
                 else
                         return -EINVAL;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))         /* only supported on external interrupts */
                         srctype = AT91_AIC_SRCTYPE_FALLING;
                 else
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 1d7bca6aa441..5fed57608507 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -226,7 +226,7 @@ static void ep93xx_gpio_irq_ack(unsigned int irq)
         int port = line >> 3;
         int port_mask = 1 << (line & 7);
 
-        if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) {
+        if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
                 gpio_int_type2[port] ^= port_mask; /* switch edge direction */
                 ep93xx_gpio_update_int_params(port);
         }
@@ -240,7 +240,7 @@ static void ep93xx_gpio_irq_mask_ack(unsigned int irq)
         int port = line >> 3;
         int port_mask = 1 << (line & 7);
 
-        if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE)
+        if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)
                 gpio_int_type2[port] ^= port_mask; /* switch edge direction */
 
         gpio_int_unmasked[port] &= ~port_mask;
@@ -283,27 +283,27 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
         gpio_direction_input(gpio);
 
         switch (type) {
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 gpio_int_type1[port] |= port_mask;
                 gpio_int_type2[port] |= port_mask;
                 desc->handle_irq = handle_edge_irq;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 gpio_int_type1[port] |= port_mask;
                 gpio_int_type2[port] &= ~port_mask;
                 desc->handle_irq = handle_edge_irq;
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 gpio_int_type1[port] &= ~port_mask;
                 gpio_int_type2[port] |= port_mask;
                 desc->handle_irq = handle_level_irq;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 gpio_int_type1[port] &= ~port_mask;
                 gpio_int_type2[port] &= ~port_mask;
                 desc->handle_irq = handle_level_irq;
                 break;
-        case IRQT_BOTHEDGE:
+        case IRQ_TYPE_EDGE_BOTH:
                 gpio_int_type1[port] |= port_mask;
                 /* set initial polarity based on current input level */
                 if (gpio_get_value(gpio))
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index e6695c4e623b..e1b1f028b930 100644
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -111,7 +111,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
         reg = irq >> 5;
         bit = 1 << (irq % 32);
 
-        if (type == IRQT_PROBE) {
+        if (type == IRQ_TYPE_PROBE) {
                 /* Don't mess with enabled GPIOs using preconfigured edges or
                    GPIOs set to alternate function during probe */
                 /* TODO: support probe */
@@ -120,7 +120,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
 //                      return 0;
 //              if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))
 //                      return 0;
-//              type = __IRQT_RISEDGE | __IRQT_FALEDGE;
+//              type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
         GIUS(reg) |= bit;
@@ -128,19 +128,19 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
 
         DEBUG_IRQ("setting type of irq %d to ", _irq);
 
-        if (type & __IRQT_RISEDGE) {
+        if (type & IRQ_TYPE_EDGE_RISING) {
                 DEBUG_IRQ("rising edges\n");
                 irq_type = 0x0;
         }
-        if (type & __IRQT_FALEDGE) {
+        if (type & IRQ_TYPE_EDGE_FALLING) {
                 DEBUG_IRQ("falling edges\n");
                 irq_type = 0x1;
         }
-        if (type & __IRQT_LOWLVL) {
+        if (type & IRQ_TYPE_LEVEL_LOW) {
                 DEBUG_IRQ("low level\n");
                 irq_type = 0x3;
         }
-        if (type & __IRQT_HIGHLVL) {
+        if (type & IRQ_TYPE_LEVEL_HIGH) {
                 DEBUG_IRQ("high level\n");
                 irq_type = 0x2;
         }
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 81cdc8267206..daf28074134b 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -329,19 +329,19 @@ static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type)
         /*
          * Then, set the proper trigger type.
          */
-        if (type & IRQT_FALLING)
+        if (type & IRQ_TYPE_EDGE_FALLING)
                 GPIO_IRQ_falling_edge |= 1 << line;
         else
                 GPIO_IRQ_falling_edge &= ~(1 << line);
-        if (type & IRQT_RISING)
+        if (type & IRQ_TYPE_EDGE_RISING)
                 GPIO_IRQ_rising_edge |= 1 << line;
         else
                 GPIO_IRQ_rising_edge &= ~(1 << line);
-        if (type & IRQT_LOW)
+        if (type & IRQ_TYPE_LEVEL_LOW)
                 GPIO_IRQ_level_low |= 1 << line;
         else
                 GPIO_IRQ_level_low &= ~(1 << line);
-        if (type & IRQT_HIGH)
+        if (type & IRQ_TYPE_LEVEL_HIGH)
                 GPIO_IRQ_level_high |= 1 << line;
         else
                 GPIO_IRQ_level_high &= ~(1 << line);
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 5fea5a132939..df16a4eac490 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -126,23 +126,23 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type)
                 return -EINVAL;
 
         switch (type) {
-        case IRQT_BOTHEDGE:
+        case IRQ_TYPE_EDGE_BOTH:
                 int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL;
                 irq_type = IXP23XX_IRQ_EDGE;
                 break;
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 int_style = IXP23XX_GPIO_STYLE_RISING_EDGE;
                 irq_type = IXP23XX_IRQ_EDGE;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE;
                 irq_type = IXP23XX_IRQ_EDGE;
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH;
                 irq_type = IXP23XX_IRQ_LEVEL;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW;
                 irq_type = IXP23XX_IRQ_LEVEL;
                 break;
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c
index f0f70ba1e46d..896ff9f840d9 100644
--- a/arch/arm/mach-ixp23xx/roadrunner.c
+++ b/arch/arm/mach-ixp23xx/roadrunner.c
@@ -110,8 +110,8 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
 
 static void __init roadrunner_pci_preinit(void)
 {
-        set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW);
+        set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
         ixp23xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index 3f867691d9f2..c6e044befccb 100644
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -30,10 +30,10 @@
 
 void __init avila_pci_preinit(void)
 {
-        set_irq_type(IRQ_AVILA_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTD, IRQT_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 3781b3db9f49..3947c506b4f3 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -142,23 +142,23 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
                 return -EINVAL;
 
         switch (type){
-        case IRQT_BOTHEDGE:
+        case IRQ_TYPE_EDGE_BOTH:
                 int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
                 irq_type = IXP4XX_IRQ_LEVEL;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
                 irq_type = IXP4XX_IRQ_LEVEL;
                 break;
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index ad2e5b97966e..be4f4a208b90 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -27,8 +27,8 @@
 
 void __init coyote_pci_preinit(void)
 {
-        set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW);
-        set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
index 9db7e1f42011..926d15f885fb 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-pci.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -25,12 +25,12 @@
 
 void __init dsmg600_pci_preinit(void)
 {
-        set_irq_type(IRQ_DSMG600_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTD, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTE, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTF, IRQT_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTF, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
index f19f3f6feda1..ca12a9ca0830 100644
--- a/arch/arm/mach-ixp4xx/fsg-pci.c
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -25,9 +25,9 @@
 
 void __init fsg_pci_preinit(void)
 {
-        set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index 6abf568322d3..afd1dc14e597 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -29,8 +29,8 @@
 
 void __init gateway7001_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index 49dec7868807..20960704183b 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -41,10 +41,10 @@
  */
 void __init gtwx5715_pci_preinit(void)
 {
-        set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQT_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 408796004812..7d9bb4d23104 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -27,10 +27,10 @@
 
 void __init ixdp425_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXDP425_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index d1e75b7dc3b1..37d9f2e8f602 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -25,8 +25,8 @@
 
 void __init ixdpg425_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index b8ebaf4a9c8e..1088426fdcee 100644
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -24,11 +24,11 @@
 
 void __init nas100d_pci_preinit(void)
 {
-        set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index 04661fef97f5..4429b8448b61 100644
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -24,9 +24,9 @@
 
 void __init nslu2_pci_preinit(void)
 {
-        set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
index 6588f2c758e2..0f00feab67f8 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-pci.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -29,8 +29,8 @@
 
 void __init wg302v2_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c
index 4c3ab43e1046..0b06941a1eed 100644
--- a/arch/arm/mach-ks8695/irq.c
+++ b/arch/arm/mach-ks8695/irq.c
@@ -72,21 +72,21 @@ static int ks8695_irq_set_type(unsigned int irqno, unsigned int type)
         ctrl = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC);
 
         switch (type) {
-                case IRQT_HIGH:
+                case IRQ_TYPE_LEVEL_HIGH:
                         mode = IOPC_TM_HIGH;
                         level_triggered = 1;
                         break;
-                case IRQT_LOW:
+                case IRQ_TYPE_LEVEL_LOW:
                         mode = IOPC_TM_LOW;
                         level_triggered = 1;
                         break;
-                case IRQT_RISING:
+                case IRQ_TYPE_EDGE_RISING:
                         mode = IOPC_TM_RISING;
                         break;
-                case IRQT_FALLING:
+                case IRQ_TYPE_EDGE_FALLING:
                         mode = IOPC_TM_FALLING;
                         break;
-                case IRQT_BOTHEDGE:
+                case IRQ_TYPE_EDGE_BOTH:
                         mode = IOPC_TM_EDGE;
                         break;
                 default:
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index fd7537f7d11e..99d4fb19a08a 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -99,19 +99,19 @@ netx_hif_irq_type(unsigned int _irq, unsigned int type)
 
         irq = _irq - NETX_IRQ_HIF_CHAINED(0);
 
-        if (type & __IRQT_RISEDGE) {
+        if (type & IRQ_TYPE_EDGE_RISING) {
                 DEBUG_IRQ("rising edges\n");
                 val |= (1 << 26) << irq;
         }
-        if (type & __IRQT_FALEDGE) {
+        if (type & IRQ_TYPE_EDGE_FALLING) {
                 DEBUG_IRQ("falling edges\n");
                 val &= ~((1 << 26) << irq);
         }
-        if (type & __IRQT_LOWLVL) {
+        if (type & IRQ_TYPE_LEVEL_LOW) {
                 DEBUG_IRQ("low level\n");
                 val &= ~((1 << 26) << irq);
         }
-        if (type & __IRQT_HIGHLVL) {
+        if (type & IRQ_TYPE_LEVEL_HIGH) {
                 DEBUG_IRQ("high level\n");
                 val |= (1 << 26) << irq;
         }
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 845c66371ca3..41f94f6fc15c 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -288,7 +288,7 @@ static void __init osk_init_cf(void)
                 return;
         }
         /* the CF I/O IRQ is really active-low */
-        set_irq_type(OMAP_GPIO_IRQ(62), IRQT_FALLING);
+        set_irq_type(OMAP_GPIO_IRQ(62), IRQ_TYPE_EDGE_FALLING);
 }
 
 static void __init osk_init_irq(void)
@@ -483,7 +483,7 @@ static void __init osk_mistral_init(void)
         omap_cfg_reg(P20_1610_GPIO4);   /* PENIRQ */
         gpio_request(4, "ts_int");
         gpio_direction_input(4);
-        set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
+        set_irq_type(OMAP_GPIO_IRQ(4), IRQ_TYPE_EDGE_FALLING);
 
         spi_register_board_info(mistral_boardinfo,
                         ARRAY_SIZE(mistral_boardinfo));
@@ -494,7 +494,7 @@ static void __init osk_mistral_init(void)
                 int ret = 0;
 
                 gpio_direction_input(OMAP_MPUIO(2));
-                set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQT_RISING);
+                set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQ_TYPE_EDGE_RISING);
 #ifdef  CONFIG_PM
                 /* share the IRQ in case someone wants to use the
                  * button for more than wakeup from system sleep.
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index e020c2774606..34389b63b0ec 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -298,11 +298,11 @@ palmz71_powercable(int irq, void *dev_id)
         if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) {
                 printk(KERN_INFO "PM: Power cable connected\n");
                 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
-                                IRQT_FALLING);
+                                IRQ_TYPE_EDGE_FALLING);
         } else {
                 printk(KERN_INFO "PM: Power cable disconnected\n");
                 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
-                                IRQT_RISING);
+                                IRQ_TYPE_EDGE_RISING);
         }
         return IRQ_HANDLED;
 }
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 5c00b3f39cdd..8948d45a2769 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -186,10 +186,10 @@ static void __init voiceblue_init(void)
         omap_request_gpio(13);
         omap_request_gpio(14);
         omap_request_gpio(15);
-        set_irq_type(OMAP_GPIO_IRQ(12), IRQT_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(14), IRQT_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(15), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING);
 
         platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
         omap_board_config = voiceblue_config;
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 0cf62ef5ecb7..d963125ed755 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void)
          */
         omap_request_gpio(13);
         omap_set_gpio_direction(13, 1);
-        set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
         set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);
 }
 
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 620fa0f120ee..870b34972d3b 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -337,17 +337,17 @@ static void __init apollon_sw_init(void)
         omap_request_gpio(SW_DOWN_GPIO58);
         omap_set_gpio_direction(SW_DOWN_GPIO58, 1);
 
-        set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
                                 IRQF_SHARED, "enter sw",
                                 &apollon_sw_interrupt))
                 return;
-        set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt,
                                 IRQF_SHARED, "up sw",
                                 &apollon_sw_interrupt))
                 return;
-        set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt,
                                 IRQF_SHARED, "down sw",
                                 &apollon_sw_interrupt))
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 88405e74e5e3..40a0bee4fbb3 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -213,7 +213,7 @@ void __init db88f5281_pci_preinit(void)
         pin = DB88F5281_PCI_SLOT0_IRQ_PIN;
         if (gpio_request(pin, "PCI Int1") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "db88f5281_pci_preinit faield to "
                                         "set_irq_type pin %d\n", pin);
@@ -226,7 +226,7 @@ void __init db88f5281_pci_preinit(void)
         pin = DB88F5281_PCI_SLOT1_SLOT2_IRQ_PIN;
         if (gpio_request(pin, "PCI Int2") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "db88f5281_pci_preinit faield "
                                         "to set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
index e2a0084ab4a3..9ae3f6dc7839 100644
--- a/arch/arm/mach-orion5x/irq.c
+++ b/arch/arm/mach-orion5x/irq.c
@@ -91,27 +91,27 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type)
         desc = irq_desc + irq;
 
         switch (type) {
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 desc->handle_irq = handle_level_irq;
                 desc->status |= IRQ_LEVEL;
                 orion5x_clrbits(GPIO_IN_POL, (1 << pin));
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 desc->handle_irq = handle_level_irq;
                 desc->status |= IRQ_LEVEL;
                 orion5x_setbits(GPIO_IN_POL, (1 << pin));
                 break;
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 desc->handle_irq = handle_edge_irq;
                 desc->status &= ~IRQ_LEVEL;
                 orion5x_clrbits(GPIO_IN_POL, (1 << pin));
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 desc->handle_irq = handle_edge_irq;
                 desc->status &= ~IRQ_LEVEL;
                 orion5x_setbits(GPIO_IN_POL, (1 << pin));
                 break;
-        case IRQT_BOTHEDGE:
+        case IRQ_TYPE_EDGE_BOTH:
                 desc->handle_irq = handle_edge_irq;
                 desc->status &= ~IRQ_LEVEL;
                 /*
@@ -156,7 +156,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                 if (cause & (1 << pin)) {
                         irq = gpio_to_irq(pin);
                         desc = irq_desc + irq;
-                        if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) {
+                        if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
                                 /* Swap polarity (race with GPIO line) */
                                 u32 polarity = readl(GPIO_IN_POL);
                                 polarity ^= 1 << pin;
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 10ae62864269..2a46d27209c1 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -148,7 +148,7 @@ void __init rd88f5182_pci_preinit(void)
         pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN;
         if (gpio_request(pin, "PCI IntA") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "rd88f5182_pci_preinit faield to "
                                         "set_irq_type pin %d\n", pin);
@@ -161,7 +161,7 @@ void __init rd88f5182_pci_preinit(void)
         pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN;
         if (gpio_request(pin, "PCI IntB") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "rd88f5182_pci_preinit faield to "
                                         "set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index a9cef9703d5b..f270ada2def9 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -117,7 +117,7 @@ void __init qnap_ts209_pci_preinit(void)
         pin = QNAP_TS209_PCI_SLOT0_IRQ_PIN;
         if (gpio_request(pin, "PCI Int1") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "qnap_ts209_pci_preinit failed to "
                                         "set_irq_type pin %d\n", pin);
@@ -131,7 +131,7 @@ void __init qnap_ts209_pci_preinit(void)
         pin = QNAP_TS209_PCI_SLOT1_IRQ_PIN;
         if (gpio_request(pin, "PCI Int2") == 0) {
                 if (gpio_direction_input(pin) == 0) {
-                        set_irq_type(gpio_to_irq(pin), IRQT_LOW);
+                        set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
                         printk(KERN_ERR "qnap_ts209_pci_preinit failed "
                                         "to set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c
index 968d0b027597..5ed67e1947a8 100644
--- a/arch/arm/mach-pnx4008/irq.c
+++ b/arch/arm/mach-pnx4008/irq.c
@@ -56,28 +56,28 @@ static void pnx4008_mask_ack_irq(unsigned int irq)
 static int pnx4008_set_irq_type(unsigned int irq, unsigned int type)
 {
         switch (type) {
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));        /*edge sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));        /*rising edge */
                 set_irq_handler(irq, handle_edge_irq);
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));        /*edge sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq));       /*falling edge */
                 set_irq_handler(irq, handle_edge_irq);
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq));       /*level sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq));       /*low level */
                 set_irq_handler(irq, handle_level_irq);
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq));       /*level sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));        /* high level */
                 set_irq_handler(irq, handle_level_irq);
                 break;
 
-        /* IRQT_BOTHEDGE is not supported */
+        /* IRQ_TYPE_EDGE_BOTH is not supported */
         default:
                 printk(KERN_ERR "PNX4008 IRQ: Unsupported irq type %d\n", type);
                 return -1;
diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
index bcf0cde6ccc9..31f5bd411ced 100644
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x270-pci.c
@@ -71,7 +71,7 @@ void __cmx270_pci_init_irq(int irq_gpio)
 
         cmx270_it8152_irq_gpio = irq_gpio;
 
-        set_irq_type(gpio_to_irq(irq_gpio), IRQT_RISING);
+        set_irq_type(gpio_to_irq(irq_gpio), IRQ_TYPE_EDGE_RISING);
 
         set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux);
 }
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index cc1c4fa06145..8d1ab54e7b20 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -113,7 +113,7 @@ static void __init lpd270_init_irq(void)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
         set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);
-        set_irq_type(IRQ_GPIO(0), IRQT_FALLING);
+        set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index ac26423cd20c..af7375bb46a4 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -152,7 +152,7 @@ static void __init lubbock_init_irq(void)
         }
 
         set_irq_chained_handler(IRQ_GPIO(0), lubbock_irq_handler);
-        set_irq_type(IRQ_GPIO(0), IRQT_FALLING);
+        set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 851ec2d9b699..c8e38b5ff1c4 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -191,7 +191,7 @@ static void __init mainstone_init_irq(void)
         MST_INTSETCLR = 0;
 
         set_irq_chained_handler(IRQ_GPIO(0), mainstone_irq_handler);
-        set_irq_type(IRQ_GPIO(0), IRQT_FALLING);
+        set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 34cd585075b0..23e9b9283301 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -146,18 +146,18 @@ void sharpsl_pm_pxa_init(void)
         if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) {
                 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin));
         }
-        else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQT_BOTHEDGE);
+        else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQ_TYPE_EDGE_BOTH);
 
         if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) {
                 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock));
         }
-        else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQT_FALLING);
+        else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQ_TYPE_EDGE_FALLING);
 
         if (sharpsl_pm.machinfo->gpio_fatal) {
                 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) {
                         dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal));
                 }
-                else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQT_FALLING);
+                else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQ_TYPE_EDGE_FALLING);
         }
 
         if (sharpsl_pm.machinfo->batfull_irq)
@@ -166,7 +166,7 @@ void sharpsl_pm_pxa_init(void)
                 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) {
                         dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));
                 }
-                else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQT_RISING);
+                else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQ_TYPE_EDGE_RISING);
         }
 }
 
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index dee7bf36f013..12811b7aea07 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -122,7 +122,7 @@ static struct resource dm9000_resources[] = {
         [2] = {
                 .start  = TRIZEPS4_ETH_IRQ,
                 .end    = TRIZEPS4_ETH_IRQ,
-                .flags  = (IORESOURCE_IRQ | IRQT_RISING),
+                .flags  = (IORESOURCE_IRQ | IRQ_TYPE_EDGE_RISING),
         },
 };
 
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 31afe50d7cd5..56d3ee01baae 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -96,7 +96,7 @@ static struct resource cerf_flash_resource = {
 static void __init cerf_init_irq(void)
 {
         sa1100_init_irq();
-        set_irq_type(CERF_ETH_IRQ, IRQT_RISING);
+        set_irq_type(CERF_ETH_IRQ, IRQ_TYPE_EDGE_RISING);
 }
 
 static struct map_desc cerf_io_desc[] __initdata = {
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 8473c37b77d6..b34ff42bbd75 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -834,7 +834,7 @@ static void __init h3800_init_irq(void)
                 set_irq_chip(irq, &h3800_gpio_irqchip);
         }
 #endif
-        set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);
+        set_irq_type(IRQ_GPIO_H3800_ASIC, IRQ_TYPE_EDGE_RISING);
         set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
 }
 
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index fa0403af7eec..c5e438b12ec7 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -46,17 +46,17 @@ static int sa1100_gpio_type(unsigned int irq, unsigned int type)
         else
                 mask = GPIO11_27_MASK(irq);
 
-        if (type == IRQT_PROBE) {
+        if (type == IRQ_TYPE_PROBE) {
                 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
                         return 0;
-                type = __IRQT_RISEDGE | __IRQT_FALEDGE;
+                type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
-        if (type & __IRQT_RISEDGE) {
+        if (type & IRQ_TYPE_EDGE_RISING) {
                 GPIO_IRQ_rising_edge |= mask;
         } else
                 GPIO_IRQ_rising_edge &= ~mask;
-        if (type & __IRQT_FALEDGE) {
+        if (type & IRQ_TYPE_EDGE_FALLING) {
                 GPIO_IRQ_falling_edge |= mask;
         } else
                 GPIO_IRQ_falling_edge &= ~mask;
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 9f1ed1509301..967a48454f6b 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -151,7 +151,7 @@ static int __devinit neponset_probe(struct platform_device *dev)
         /*
          * Install handler for GPIO25.
          */
-        set_irq_type(IRQ_GPIO25, IRQT_RISING);
+        set_irq_type(IRQ_GPIO25, IRQ_TYPE_EDGE_RISING);
         set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler);
 
         /*
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index c7bf7e0038f0..69a71f11625e 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -143,7 +143,7 @@ static void __init pleb_map_io(void)
 
         GPDR &= ~GPIO_ETH0_IRQ;
 
-        set_irq_type(GPIO_ETH0_IRQ, IRQT_FALLING);
+        set_irq_type(GPIO_ETH0_IRQ, IRQ_TYPE_EDGE_FALLING);
 }
 
 MACHINE_START(PLEB, "PLEB")
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index 333a82a3717e..db7b3e38ef1d 100644
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -274,6 +274,11 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
 void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
 {
+        void *memory;
+
+        if (dma_alloc_from_coherent(dev, size, handle, &memory))
+                return memory;
+
         if (arch_is_coherent()) {
                 void *virt;
 
@@ -362,6 +367,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
 
         WARN_ON(irqs_disabled());
 
+        if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
+                return;
+
         if (arch_is_coherent()) {
                 kfree(cpu_addr);
                 return;
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index fbfa26058442..a8ec97b4752e 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -37,7 +37,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
         pgd_t *pgd;
         pmd_t *pmd;
         pte_t *pte, entry;
-        int ret = 0;
+        int ret;
 
         pgd = pgd_offset(vma->vm_mm, address);
         if (pgd_none(*pgd))
@@ -55,15 +55,19 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
         entry = *pte;
 
         /*
+         * If this page is present, it's actually being shared.
+         */
+        ret = pte_present(entry);
+
+        /*
          * If this page isn't present, or is already setup to
          * fault (ie, is old), we can safely ignore any issues.
          */
-        if (pte_present(entry) && pte_val(entry) & shared_pte_mask) {
+        if (ret && pte_val(entry) & shared_pte_mask) {
                 flush_cache_page(vma, address, pte_pfn(entry));
                 pte_val(entry) &= ~shared_pte_mask;
                 set_pte_at(vma->vm_mm, address, pte, entry);
                 flush_tlb_page(vma, address);
-                ret = 1;
         }
         pte_unmap(pte);
         return ret;
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index 4a7736717d86..318b268f938e 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -73,19 +73,19 @@ static int gpio_set_irq_type(u32 irq, u32 type)
         void __iomem *reg = port->base;
 
         switch (type) {
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 edge = GPIO_INT_RISE_EDGE;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 edge = GPIO_INT_FALL_EDGE;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 edge = GPIO_INT_LOW_LEV;
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 edge = GPIO_INT_HIGH_LEV;
                 break;
-        default:        /* this includes IRQT_BOTHEDGE */
+        default:        /* this includes IRQ_TYPE_EDGE_BOTH */
                 return -EINVAL;
         }
 
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index d8e9c2c3f0f6..63e094342ef6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -517,13 +517,13 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
         u32 gpio_bit = 1 << gpio;
 
         MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit,
-                trigger & __IRQT_LOWLVL);
+                trigger & IRQ_TYPE_LEVEL_LOW);
         MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit,
-                trigger & __IRQT_HIGHLVL);
+                trigger & IRQ_TYPE_LEVEL_HIGH);
         MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit,
-                trigger & __IRQT_RISEDGE);
+                trigger & IRQ_TYPE_EDGE_RISING);
         MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit,
-                trigger & __IRQT_FALEDGE);
+                trigger & IRQ_TYPE_EDGE_FALLING);
 
         if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
                 if (trigger != 0)
@@ -555,9 +555,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
         case METHOD_MPUIO:
                 reg += OMAP_MPUIO_GPIO_INT_EDGE;
                 l = __raw_readl(reg);
-                if (trigger & __IRQT_RISEDGE)
+                if (trigger & IRQ_TYPE_EDGE_RISING)
                         l |= 1 << gpio;
-                else if (trigger & __IRQT_FALEDGE)
+                else if (trigger & IRQ_TYPE_EDGE_FALLING)
                         l &= ~(1 << gpio);
                 else
                         goto bad;
@@ -567,9 +567,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
         case METHOD_GPIO_1510:
                 reg += OMAP1510_GPIO_INT_CONTROL;
                 l = __raw_readl(reg);
-                if (trigger & __IRQT_RISEDGE)
+                if (trigger & IRQ_TYPE_EDGE_RISING)
                         l |= 1 << gpio;
-                else if (trigger & __IRQT_FALEDGE)
+                else if (trigger & IRQ_TYPE_EDGE_FALLING)
                         l &= ~(1 << gpio);
                 else
                         goto bad;
@@ -584,9 +584,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
                 gpio &= 0x07;
                 l = __raw_readl(reg);
                 l &= ~(3 << (gpio << 1));
-                if (trigger & __IRQT_RISEDGE)
+                if (trigger & IRQ_TYPE_EDGE_RISING)
                         l |= 2 << (gpio << 1);
-                if (trigger & __IRQT_FALEDGE)
+                if (trigger & IRQ_TYPE_EDGE_FALLING)
                         l |= 1 << (gpio << 1);
                 if (trigger)
                         /* Enable wake-up during idle for dynamic tick */
@@ -599,9 +599,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
         case METHOD_GPIO_730:
                 reg += OMAP730_GPIO_INT_CONTROL;
                 l = __raw_readl(reg);
-                if (trigger & __IRQT_RISEDGE)
+                if (trigger & IRQ_TYPE_EDGE_RISING)
                         l |= 1 << gpio;
-                else if (trigger & __IRQT_FALEDGE)
+                else if (trigger & IRQ_TYPE_EDGE_FALLING)
                         l &= ~(1 << gpio);
                 else
                         goto bad;
@@ -887,7 +887,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio)
         _set_gpio_direction(bank, get_gpio_index(gpio), 1);
         _set_gpio_irqenable(bank, gpio, 0);
         _clear_gpio_irqstatus(bank, gpio);
-        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE);
+        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
 }
 
 /* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
@@ -924,7 +924,7 @@ int omap_request_gpio(int gpio)
         /* Set trigger to none. You need to enable the desired trigger with
          * request_irq() or set_irq_type().
          */
-        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE);
+        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
 
 #ifdef CONFIG_ARCH_OMAP15XX
         if (bank->method == METHOD_GPIO_1510) {
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 5e28c217b8c2..0af3872fb763 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -9,7 +9,7 @@ config PLAT_S3C24XX
         depends on ARCH_S3C2410
         default y if ARCH_S3C2410
         select NO_IOPORT
-        select HAVE_GPIO_LIB
+        select ARCH_REQUIRE_GPIOLIB
         help
           Base platform code for any Samsung S3C24XX device
 
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index ae2c5d7efc9d..001436c04b13 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -292,27 +292,27 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
         /* Set the external interrupt to pointed trigger type */
         switch (type)
         {
-                case IRQT_NOEDGE:
+                case IRQ_TYPE_NONE:
                         printk(KERN_WARNING "No edge setting!\n");
                         break;
 
-                case IRQT_RISING:
+                case IRQ_TYPE_EDGE_RISING:
                         newvalue = S3C2410_EXTINT_RISEEDGE;
                         break;
 
-                case IRQT_FALLING:
+                case IRQ_TYPE_EDGE_FALLING:
                         newvalue = S3C2410_EXTINT_FALLEDGE;
                         break;
 
-                case IRQT_BOTHEDGE:
+                case IRQ_TYPE_EDGE_BOTH:
                         newvalue = S3C2410_EXTINT_BOTHEDGE;
                         break;
 
-                case IRQT_LOW:
+                case IRQ_TYPE_LEVEL_LOW:
                         newvalue = S3C2410_EXTINT_LOWLEV;
                         break;
 
-                case IRQT_HIGH:
+                case IRQ_TYPE_LEVEL_HIGH:
                         newvalue = S3C2410_EXTINT_HILEV;
                         break;
 
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 14dc5a143695..8538ba75ef92 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -21,6 +21,8 @@
 
 #include <asm/io.h>
 #include <asm/setup.h>
+#include <asm/atmel-mci.h>
+
 #include <asm/arch/at32ap700x.h>
 #include <asm/arch/board.h>
 #include <asm/arch/init.h>
@@ -260,6 +262,21 @@ void __init setup_board(void)
         at32_setup_serial_console(0);
 }
 
+#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
+
+/* MMC card detect requires MACB0 *NOT* be used */
+#ifdef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM
+static struct mci_platform_data __initdata mci0_data = {
+        .detect_pin     = GPIO_PIN_PC(14),      /* gpio30/sdcd */
+        .wp_pin         = GPIO_PIN_PC(15),      /* gpio31/sdwp */
+};
+#define MCI_PDATA       &mci0_data
+#else
+#define MCI_PDATA       NULL
+#endif  /* SW6 for sd{cd,wp} routing */
+
+#endif  /* SW2 for MMC signal routing */
+
 static int __init atstk1002_init(void)
 {
         /*
@@ -309,7 +326,7 @@ static int __init atstk1002_init(void)
         at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
 #endif
 #ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM
-        at32_add_device_mci(0, NULL);
+        at32_add_device_mci(0, MCI_PDATA);
 #endif
 #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM
         set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index ea109f435a83..591fc73b554a 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -154,7 +154,7 @@ static int __init atstk1003_init(void)
         at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
 #endif
 #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-        at32_add_device_mci(0);
+        at32_add_device_mci(0, NULL);
 #endif
         at32_add_device_usba(0, NULL);
 #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index c7236df74d74..d9c5e0a21256 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -137,7 +137,7 @@ static int __init atstk1004_init(void)
         at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
 #endif
 #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-        at32_add_device_mci(0);
+        at32_add_device_mci(0, NULL);
 #endif
         at32_add_device_lcdc(0, &atstk1000_lcdc_data,
                              fbmem_start, fbmem_size, 0);
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index abd954fb7ba0..7e7f32771ae1 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -43,6 +43,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *evdev = dev_id;
 
+        if (unlikely(!(intc_get_pending(0) & 1)))
+                return IRQ_NONE;
+
         /*
          * Disable the interrupt until the clockevent subsystem
          * reprograms it.
@@ -55,7 +58,8 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction timer_irqaction = {
         .handler        = timer_interrupt,
-        .flags          = IRQF_TIMER | IRQF_DISABLED,
+        /* Oprofile uses the same irq as the timer, so allow it to be shared */
+        .flags          = IRQF_TIMER | IRQF_DISABLED | IRQF_SHARED,
         .name           = "avr32_comparator",
 };
 
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 351e1b42f937..1617048c86c5 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
 
@@ -1285,7 +1286,6 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
         struct mci_platform_data        _data;
         struct platform_device          *pdev;
-        struct dw_dma_slave             *dws;
 
         if (id != 0)
                 return NULL;
@@ -1300,7 +1300,9 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 
         if (!data) {
                 data = &_data;
-                memset(data, 0, sizeof(struct mci_platform_data));
+                memset(data, -1, sizeof(struct mci_platform_data));
+                data->detect_pin = GPIO_PIN_NONE;
+                data->wp_pin = GPIO_PIN_NONE;
         }
 
         if (platform_device_add_data(pdev, data,
@@ -1314,12 +1316,10 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
         select_peripheral(PA(14), PERIPH_A, 0); /* DATA2 */
         select_peripheral(PA(15), PERIPH_A, 0); /* DATA3 */
 
-        if (data) {
-                if (data->detect_pin != GPIO_PIN_NONE)
-                        at32_select_gpio(data->detect_pin, 0);
-                if (data->wp_pin != GPIO_PIN_NONE)
-                        at32_select_gpio(data->wp_pin, 0);
-        }
+        if (gpio_is_valid(data->detect_pin))
+                at32_select_gpio(data->detect_pin, 0);
+        if (gpio_is_valid(data->wp_pin))
+                at32_select_gpio(data->wp_pin, 0);
 
         atmel_mci0_pclk.dev = &pdev->dev;
 
@@ -1853,11 +1853,11 @@ at32_add_device_cf(unsigned int id, unsigned int extint,
         if (at32_init_ide_or_cf(pdev, data->cs, extint))
                 goto fail;
 
-        if (data->detect_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->detect_pin))
                 at32_select_gpio(data->detect_pin, AT32_GPIOF_DEGLITCH);
-        if (data->reset_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->reset_pin))
                 at32_select_gpio(data->reset_pin, 0);
-        if (data->vcc_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->vcc_pin))
                 at32_select_gpio(data->vcc_pin, 0);
         /* READY is used as extint, so we can't select it as gpio */
 
@@ -1937,9 +1937,11 @@ static struct clk atmel_ac97c0_pclk = {
         .index          = 10,
 };
 
-struct platform_device *__init at32_add_device_ac97c(unsigned int id)
+struct platform_device *__init
+at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data)
 {
         struct platform_device *pdev;
+        struct ac97c_platform_data _data;
 
         if (id != 0)
                 return NULL;
@@ -1950,19 +1952,37 @@ struct platform_device *__init at32_add_device_ac97c(unsigned int id)
 
         if (platform_device_add_resources(pdev, atmel_ac97c0_resource,
                                 ARRAY_SIZE(atmel_ac97c0_resource)))
-                goto err_add_resources;
+                goto fail;
+
+        if (!data) {
+                data = &_data;
+                memset(data, 0, sizeof(struct ac97c_platform_data));
+                data->reset_pin = GPIO_PIN_NONE;
+        }
 
-        select_peripheral(PB(20), PERIPH_B, 0); /* SYNC */
-        select_peripheral(PB(21), PERIPH_B, 0); /* SDO  */
-        select_peripheral(PB(22), PERIPH_B, 0); /* SDI  */
-        select_peripheral(PB(23), PERIPH_B, 0); /* SCLK */
+        data->dma_rx_periph_id = 3;
+        data->dma_tx_periph_id = 4;
+        data->dma_controller_id = 0;
+
+        if (platform_device_add_data(pdev, data,
+                                sizeof(struct ac97c_platform_data)))
+                goto fail;
+
+        select_peripheral(PB(20), PERIPH_B, 0); /* SDO  */
+        select_peripheral(PB(21), PERIPH_B, 0); /* SYNC */
+        select_peripheral(PB(22), PERIPH_B, 0); /* SCLK */
+        select_peripheral(PB(23), PERIPH_B, 0); /* SDI  */
+
+        /* TODO: gpio_is_valid(data->reset_pin) with kernel 2.6.26. */
+        if (data->reset_pin != GPIO_PIN_NONE)
+                at32_select_gpio(data->reset_pin, 0);
 
         atmel_ac97c0_pclk.dev = &pdev->dev;
 
         platform_device_add(pdev);
         return pdev;
 
-err_add_resources:
+fail:
         platform_device_put(pdev);
         return NULL;
 }
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 2a92cb1886ca..7a64fcef9d07 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -641,6 +641,7 @@ config PCI
        bool
        depends on ETRAX_CARDBUS
        default y
+       select HAVE_GENERIC_DMA_COHERENT
 
 config ETRAX_IOP_FW_LOAD
         tristate "IO-processor hotplug firmware loading support"
diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c
index e0364654fc44..fbe65954ee6c 100644
--- a/arch/cris/arch-v32/drivers/pci/dma.c
+++ b/arch/cris/arch-v32/drivers/pci/dma.c
@@ -15,35 +15,16 @@
 #include <linux/pci.h>
 #include <asm/io.h>
 
-struct dma_coherent_mem {
-        void            *virt_base;
-        u32             device_base;
-        int             size;
-        int             flags;
-        unsigned long   *bitmap;
-};
-
 void *dma_alloc_coherent(struct device *dev, size_t size,
                            dma_addr_t *dma_handle, gfp_t gfp)
 {
         void *ret;
-        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
         int order = get_order(size);
         /* ignore region specifiers */
         gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
 
-        if (mem) {
-                int page = bitmap_find_free_region(mem->bitmap, mem->size,
-                                                     order);
-                if (page >= 0) {
-                        *dma_handle = mem->device_base + (page << PAGE_SHIFT);
-                        ret = mem->virt_base + (page << PAGE_SHIFT);
-                        memset(ret, 0, size);
-                        return ret;
-                }
-                if (mem->flags & DMA_MEMORY_EXCLUSIVE)
-                        return NULL;
-        }
+        if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+                return ret;
 
         if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
                 gfp |= GFP_DMA;
@@ -60,90 +41,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 void dma_free_coherent(struct device *dev, size_t size,
                          void *vaddr, dma_addr_t dma_handle)
 {
-        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
         int order = get_order(size);
 
-        if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
-                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-
-                bitmap_release_region(mem->bitmap, page, order);
-        } else
+        if (!dma_release_from_coherent(dev, order, vaddr))
                 free_pages((unsigned long)vaddr, order);
 }
 
-int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-                                dma_addr_t device_addr, size_t size, int flags)
-{
-        void __iomem *mem_base;
-        int pages = size >> PAGE_SHIFT;
-        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
-
-        if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
-                goto out;
-        if (!size)
-                goto out;
-        if (dev->dma_mem)
-                goto out;
-
-        /* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
-
-        mem_base = ioremap(bus_addr, size);
-        if (!mem_base)
-                goto out;
-
-        dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
-        if (!dev->dma_mem)
-                goto iounmap_out;
-        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
-        if (!dev->dma_mem->bitmap)
-                goto free1_out;
-
-        dev->dma_mem->virt_base = mem_base;
-        dev->dma_mem->device_base = device_addr;
-        dev->dma_mem->size = pages;
-        dev->dma_mem->flags = flags;
-
-        if (flags & DMA_MEMORY_MAP)
-                return DMA_MEMORY_MAP;
-
-        return DMA_MEMORY_IO;
-
- free1_out:
-        kfree(dev->dma_mem);
- iounmap_out:
-        iounmap(mem_base);
- out:
-        return 0;
-}
-EXPORT_SYMBOL(dma_declare_coherent_memory);
-
-void dma_release_declared_memory(struct device *dev)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-
-        if(!mem)
-                return;
-        dev->dma_mem = NULL;
-        iounmap(mem->virt_base);
-        kfree(mem->bitmap);
-        kfree(mem);
-}
-EXPORT_SYMBOL(dma_release_declared_memory);
-
-void *dma_mark_declared_memory_occupied(struct device *dev,
-                                        dma_addr_t device_addr, size_t size)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-        int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        int pos, err;
-
-        if (!mem)
-                return ERR_PTR(-EINVAL);
-
-        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
-        err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
-        if (err != 0)
-                return ERR_PTR(err);
-        return mem->virt_base + (pos << PAGE_SHIFT);
-}
-EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 2672f4d278ac..7a37d06376be 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -125,9 +125,9 @@ void kvm_arch_hardware_enable(void *garbage)
                                 PAGE_KERNEL));
         local_irq_save(saved_psr);
         slot = ia64_itr_entry(0x3, KVM_VMM_BASE, pte, KVM_VMM_SHIFT);
+        local_irq_restore(saved_psr);
         if (slot < 0)
                 return;
-        local_irq_restore(saved_psr);
 
         spin_lock(&vp_lock);
         status = ia64_pal_vp_init_env(kvm_vsa_base ?
@@ -160,9 +160,9 @@ void kvm_arch_hardware_disable(void *garbage)
 
         local_irq_save(saved_psr);
         slot = ia64_itr_entry(0x3, KVM_VMM_BASE, pte, KVM_VMM_SHIFT);
+        local_irq_restore(saved_psr);
         if (slot < 0)
                 return;
-        local_irq_restore(saved_psr);
 
         status = ia64_pal_vp_exit_env(host_iva);
         if (status)
@@ -1253,6 +1253,7 @@ static int vti_vcpu_setup(struct kvm_vcpu *vcpu, int id)
 uninit:
         kvm_vcpu_uninit(vcpu);
 fail:
+        local_irq_restore(psr);
         return r;
 }
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index fe88418167c5..587da5e0990f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -117,6 +117,7 @@ config PPC
         select HAVE_KPROBES
         select HAVE_ARCH_KGDB
         select HAVE_KRETPROBES
+        select HAVE_ARCH_TRACEHOOK
         select HAVE_LMB
         select HAVE_DMA_ATTRS if PPC64
         select USE_GENERIC_SMP_HELPERS if SMP
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 81c8324a4a3c..1cbbf7033641 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -148,7 +148,7 @@ transfer_to_handler:
         /* Check to see if the dbcr0 register is set up to debug.  Use the
            internal debug mode bit to do this. */
         lwz     r12,THREAD_DBCR0(r12)
-        andis.  r12,r12,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r12,r12,DBCR0_IDM@h
         beq+    3f
         /* From user and task is ptraced - load up global dbcr0 */
         li      r12,-1                  /* clear all pending debug events */
@@ -292,7 +292,7 @@ syscall_exit_cont:
         /* If the process has its own DBCR0 value, load it up.  The internal
            debug mode bit tells us that dbcr0 should be loaded. */
         lwz     r0,THREAD+THREAD_DBCR0(r2)
-        andis.  r10,r0,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r10,r0,DBCR0_IDM@h
         bnel-   load_dbcr0
 #endif
 #ifdef CONFIG_44x
@@ -343,7 +343,12 @@ syscall_dotrace:
         stw     r0,_TRAP(r1)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      do_syscall_trace_enter
-        lwz     r0,GPR0(r1)     /* Restore original registers */
+        /*
+         * Restore argument registers possibly just changed.
+         * We use the return value of do_syscall_trace_enter
+         * for call number to look up in the table (r0).
+         */
+        mr      r0,r3
         lwz     r3,GPR3(r1)
         lwz     r4,GPR4(r1)
         lwz     r5,GPR5(r1)
@@ -720,7 +725,7 @@ restore_user:
         /* Check whether this process has its own DBCR0 value.  The internal
            debug mode bit tells us that dbcr0 should be loaded. */
         lwz     r0,THREAD+THREAD_DBCR0(r2)
-        andis.  r10,r0,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r10,r0,DBCR0_IDM@h
         bnel-   load_dbcr0
 #endif
 
@@ -1055,8 +1060,8 @@ do_user_signal:			/* r10 contains MSR_KERNEL here */
         SAVE_NVGPRS(r1)
         rlwinm  r3,r3,0,0,30
         stw     r3,_TRAP(r1)
-2:      li      r3,0
-        addi    r4,r1,STACK_FRAME_OVERHEAD
+2:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        mr      r4,r9
         bl      do_signal
         REST_NVGPRS(r1)
         b       recheck
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index d7369243ae44..2d802e97097c 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -214,7 +214,12 @@ syscall_dotrace:
         bl      .save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .do_syscall_trace_enter
-        ld      r0,GPR0(r1)     /* Restore original registers */
+        /*
+         * Restore argument registers possibly just changed.
+         * We use the return value of do_syscall_trace_enter
+         * for the call number to look up in the table (r0).
+         */
+        mr      r0,r3
         ld      r3,GPR3(r1)
         ld      r4,GPR4(r1)
         ld      r5,GPR5(r1)
@@ -638,8 +643,7 @@ user_work:
         b       .ret_from_except_lite
 
 1:      bl      .save_nvgprs
-        li      r3,0
-        addi    r4,r1,STACK_FRAME_OVERHEAD
+        addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .do_signal
         b       .ret_from_except
 
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 4d96e1db55ee..9ddfaef1a184 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -493,18 +493,18 @@ static int __init serial_dev_init(void)
 device_initcall(serial_dev_init);
 
 
+#ifdef CONFIG_SERIAL_8250_CONSOLE
 /*
  * This is called very early, as part of console_init() (typically just after
  * time_init()). This function is respondible for trying to find a good
  * default console on serial ports. It tries to match the open firmware
- * default output with one of the available serial console drivers, either
- * one of the platform serial ports that have been probed earlier by
- * find_legacy_serial_ports() or some more platform specific ones.
+ * default output with one of the available serial console drivers that have
+ * been probed earlier by find_legacy_serial_ports()
  */
 static int __init check_legacy_serial_console(void)
 {
         struct device_node *prom_stdout = NULL;
-        int speed = 0, offset = 0;
+        int i, speed = 0, offset = 0;
         const char *name;
         const u32 *spd;
 
@@ -548,31 +548,20 @@ static int __init check_legacy_serial_console(void)
         if (spd)
                 speed = *spd;
 
-        if (0)
-                ;
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        else if (strcmp(name, "serial") == 0) {
-                int i;
-                /* Look for it in probed array */
-                for (i = 0; i < legacy_serial_count; i++) {
-                        if (prom_stdout != legacy_serial_infos[i].np)
-                                continue;
-                        offset = i;
-                        speed = legacy_serial_infos[i].speed;
-                        break;
-                }
-                if (i >= legacy_serial_count)
-                        goto not_found;
+        if (strcmp(name, "serial") != 0)
+                goto not_found;
+
+        /* Look for it in probed array */
+        for (i = 0; i < legacy_serial_count; i++) {
+                if (prom_stdout != legacy_serial_infos[i].np)
+                        continue;
+                offset = i;
+                speed = legacy_serial_infos[i].speed;
+                break;
         }
-#endif /* CONFIG_SERIAL_8250_CONSOLE */
-#ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE
-        else if (strcmp(name, "ch-a") == 0)
-                offset = 0;
-        else if (strcmp(name, "ch-b") == 0)
-                offset = 1;
-#endif /* CONFIG_SERIAL_PMACZILOG_CONSOLE */
-        else
+        if (i >= legacy_serial_count)
                 goto not_found;
+
         of_node_put(prom_stdout);
 
         DBG("Found serial console at ttyS%d\n", offset);
@@ -591,3 +580,4 @@ static int __init check_legacy_serial_console(void)
 }
 console_initcall(check_legacy_serial_console);
 
+#endif /* CONFIG_SERIAL_8250_CONSOLE */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index db2497ccc111..e030f3bd5024 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -254,7 +254,7 @@ void do_dabr(struct pt_regs *regs, unsigned long address,
                 return;
 
         /* Clear the DAC and struct entries.  One shot trigger */
-#if (defined(CONFIG_44x) || defined(CONFIG_BOOKE))
+#if defined(CONFIG_BOOKE)
         mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~(DBSR_DAC1R | DBSR_DAC1W
                                                         | DBCR0_IDM));
 #endif
@@ -286,7 +286,7 @@ int set_dabr(unsigned long dabr)
         mtspr(SPRN_DABR, dabr);
 #endif
 
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
         mtspr(SPRN_DAC1, dabr);
 #endif
 
@@ -373,7 +373,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
         if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr))
                 set_dabr(new->thread.dabr);
 
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
         /* If new thread DAC (HW breakpoint) is the same then leave it */
         if (new->thread.dabr)
                 set_dabr(new->thread.dabr);
@@ -568,7 +568,7 @@ void flush_thread(void)
                 current->thread.dabr = 0;
                 set_dabr(0);
 
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
                 current->thread.dbcr0 &= ~(DBSR_DAC1R | DBSR_DAC1W);
 #endif
         }
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index c4ab2195b9cb..b72849ac7db3 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -205,8 +205,6 @@ static int __initdata mem_reserve_cnt;
 static cell_t __initdata regbuf[1024];
 
 
-#define MAX_CPU_THREADS 2
-
 /*
  * Error results ... some OF calls will return "-1" on error, some
  * will return 0, some will return either. To simplify, here are
@@ -1339,10 +1337,6 @@ static void __init prom_hold_cpus(void)
         unsigned int reg;
         phandle node;
         char type[64];
-        int cpuid = 0;
-        unsigned int interrupt_server[MAX_CPU_THREADS];
-        unsigned int cpu_threads, hw_cpu_num;
-        int propsize;
         struct prom_t *_prom = &RELOC(prom);
         unsigned long *spinloop
                 = (void *) LOW_ADDR(__secondary_hold_spinloop);
@@ -1386,7 +1380,6 @@ static void __init prom_hold_cpus(void)
                 reg = -1;
                 prom_getprop(node, "reg", &reg, sizeof(reg));
 
-                prom_debug("\ncpuid        = 0x%x\n", cpuid);
                 prom_debug("cpu hw idx   = 0x%x\n", reg);
 
                 /* Init the acknowledge var which will be reset by
@@ -1395,28 +1388,9 @@ static void __init prom_hold_cpus(void)
                  */
                 *acknowledge = (unsigned long)-1;
 
-                propsize = prom_getprop(node, "ibm,ppc-interrupt-server#s",
-                                        &interrupt_server,
-                                        sizeof(interrupt_server));
-                if (propsize < 0) {
-                        /* no property.  old hardware has no SMT */
-                        cpu_threads = 1;
-                        interrupt_server[0] = reg; /* fake it with phys id */
-                } else {
-                        /* We have a threaded processor */
-                        cpu_threads = propsize / sizeof(u32);
-                        if (cpu_threads > MAX_CPU_THREADS) {
-                                prom_printf("SMT: too many threads!\n"
-                                            "SMT: found %x, max is %x\n",
-                                            cpu_threads, MAX_CPU_THREADS);
-                                cpu_threads = 1; /* ToDo: panic? */
-                        }
-                }
-
-                hw_cpu_num = interrupt_server[0];
-                if (hw_cpu_num != _prom->cpu) {
+                if (reg != _prom->cpu) {
                         /* Primary Thread of non-boot cpu */
-                        prom_printf("%x : starting cpu hw idx %x... ", cpuid, reg);
+                        prom_printf("starting cpu hw idx %x... ", reg);
                         call_prom("start-cpu", 3, 0, node,
                                   secondary_hold, reg);
 
@@ -1431,17 +1405,10 @@ static void __init prom_hold_cpus(void)
                 }
 #ifdef CONFIG_SMP
                 else
-                        prom_printf("%x : boot cpu     %x\n", cpuid, reg);
+                        prom_printf("boot cpu hw idx %x\n", reg);
 #endif /* CONFIG_SMP */
-
-                /* Reserve cpu #s for secondary threads.   They start later. */
-                cpuid += cpu_threads;
         }
 
-        if (cpuid > NR_CPUS)
-                prom_printf("WARNING: maximum CPUs (" __stringify(NR_CPUS)
-                            ") exceeded: ignoring extras\n");
-
         prom_debug("prom_hold_cpus: end...\n");
 }
 
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index a5d0e78779c8..6b66cd85b433 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/regset.h>
+#include <linux/tracehook.h>
 #include <linux/elf.h>
 #include <linux/user.h>
 #include <linux/security.h>
@@ -717,7 +718,7 @@ void user_disable_single_step(struct task_struct *task)
         struct pt_regs *regs = task->thread.regs;
 
 
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
         /* If DAC then do not single step, skip */
         if (task->thread.dabr)
                 return;
@@ -744,10 +745,11 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
         if (addr > 0)
                 return -EINVAL;
 
+        /* The bottom 3 bits in dabr are flags */
         if ((data & ~0x7UL) >= TASK_SIZE)
                 return -EIO;
 
-#ifdef CONFIG_PPC64
+#ifndef CONFIG_BOOKE
 
         /* For processors using DABR (i.e. 970), the bottom 3 bits are flags.
          *  It was assumed, on previous implementations, that 3 bits were
@@ -769,7 +771,7 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
         task->thread.dabr = data;
 
 #endif
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
 
         /* As described above, it was assumed 3 bits were passed with the data
          *  address, but we will assume only the mode bits will be passed
@@ -1013,31 +1015,24 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         return ret;
 }
 
-static void do_syscall_trace(void)
+/*
+ * We must return the syscall number to actually look up in the table.
+ * This can be -1L to skip running any syscall at all.
+ */
+long do_syscall_trace_enter(struct pt_regs *regs)
 {
-        /* the 0x80 provides a way for the tracing parent to distinguish
-           between a syscall stop and SIGTRAP delivery */
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
-
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
-        }
-}
+        long ret = 0;
 
-void do_syscall_trace_enter(struct pt_regs *regs)
-{
         secure_computing(regs->gpr[0]);
 
-        if (test_thread_flag(TIF_SYSCALL_TRACE)
-            && (current->ptrace & PT_PTRACED))
-                do_syscall_trace();
+        if (test_thread_flag(TIF_SYSCALL_TRACE) &&
+            tracehook_report_syscall_entry(regs))
+                /*
+                 * Tracing decided this syscall should not happen.
+                 * We'll return a bogus call number to get an ENOSYS
+                 * error, but leave the original number in regs->gpr[0].
+                 */
+                ret = -1L;
 
         if (unlikely(current->audit_context)) {
 #ifdef CONFIG_PPC64
@@ -1055,16 +1050,19 @@ void do_syscall_trace_enter(struct pt_regs *regs)
                                             regs->gpr[5] & 0xffffffff,
                                             regs->gpr[6] & 0xffffffff);
         }
+
+        return ret ?: regs->gpr[0];
 }
 
 void do_syscall_trace_leave(struct pt_regs *regs)
 {
+        int step;
+
         if (unlikely(current->audit_context))
                 audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                    regs->result);
 
-        if ((test_thread_flag(TIF_SYSCALL_TRACE)
-             || test_thread_flag(TIF_SINGLESTEP))
-            && (current->ptrace & PT_PTRACED))
-                do_syscall_trace();
+        step = test_thread_flag(TIF_SINGLESTEP);
+        if (step || test_thread_flag(TIF_SYSCALL_TRACE))
+                tracehook_report_syscall_exit(regs, step);
 }
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 61a3f4132087..9cc5a52711e5 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -367,7 +367,6 @@ static void __init cpu_init_thread_core_maps(int tpc)
  * setup_cpu_maps - initialize the following cpu maps:
  *                  cpu_possible_map
  *                  cpu_present_map
- *                  cpu_sibling_map
  *
  * Having the possible map set up early allows us to restrict allocations
  * of things like irqstacks to num_possible_cpus() rather than NR_CPUS.
@@ -475,29 +474,6 @@ void __init smp_setup_cpu_maps(void)
          */
         cpu_init_thread_core_maps(nthreads);
 }
-
-/*
- * Being that cpu_sibling_map is now a per_cpu array, then it cannot
- * be initialized until the per_cpu areas have been created.  This
- * function is now called from setup_per_cpu_areas().
- */
-void __init smp_setup_cpu_sibling_map(void)
-{
-#ifdef CONFIG_PPC64
-        int i, cpu, base;
-
-        for_each_possible_cpu(cpu) {
-                DBG("Sibling map for CPU %d:", cpu);
-                base = cpu_first_thread_in_core(cpu);
-                for (i = 0; i < threads_per_core; i++) {
-                        cpu_set(base + i, per_cpu(cpu_sibling_map, cpu));
-                        DBG(" %d", base + i);
-                }
-                DBG("\n");
-        }
-
-#endif /* CONFIG_PPC64 */
-}
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_PCSPKR_PLATFORM
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 04d8de9f0fc6..8b25f51f03bf 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -611,9 +611,6 @@ void __init setup_per_cpu_areas(void)
                 paca[i].data_offset = ptr - __per_cpu_start;
                 memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
         }
-
-        /* Now that per_cpu is setup, initialize cpu_sibling_map */
-        smp_setup_cpu_sibling_map();
 }
 #endif
 
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 7aada783ec6a..a54405ebd7b0 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -9,7 +9,7 @@
  * this archive for more details.
  */
 
-#include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -112,7 +112,7 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
         }
 }
 
-int do_signal(sigset_t *oldset, struct pt_regs *regs)
+static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
 {
         siginfo_t info;
         int signr;
@@ -147,7 +147,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
          */
         if (current->thread.dabr) {
                 set_dabr(current->thread.dabr);
-#if defined(CONFIG_44x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
                 mtspr(SPRN_DBCR0, current->thread.dbcr0);
 #endif
         }
@@ -177,11 +177,28 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
                  * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
                  */
                 current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
+
+                /*
+                 * Let tracing know that we've done the handler setup.
+                 */
+                tracehook_signal_handler(signr, &info, &ka, regs,
+                                         test_thread_flag(TIF_SINGLESTEP));
         }
 
         return ret;
 }
 
+void do_signal(struct pt_regs *regs, unsigned long thread_info_flags)
+{
+        if (thread_info_flags & _TIF_SIGPENDING)
+                do_signal_pending(NULL, regs);
+
+        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
+                clear_thread_flag(TIF_NOTIFY_RESUME);
+                tracehook_notify_resume(regs);
+        }
+}
+
 long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
                 unsigned long r5, unsigned long r6, unsigned long r7,
                 unsigned long r8, struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index f5ae9fa222ea..5337ca7bb649 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -41,6 +41,7 @@
 #include <asm/smp.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
+#include <asm/cputhreads.h>
 #include <asm/cputable.h>
 #include <asm/system.h>
 #include <asm/mpic.h>
@@ -62,10 +63,12 @@ struct thread_info *secondary_ti;
 cpumask_t cpu_possible_map = CPU_MASK_NONE;
 cpumask_t cpu_online_map = CPU_MASK_NONE;
 DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
+DEFINE_PER_CPU(cpumask_t, cpu_core_map) = CPU_MASK_NONE;
 
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(cpu_possible_map);
 EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
+EXPORT_PER_CPU_SYMBOL(cpu_core_map);
 
 /* SMP operations for this machine */
 struct smp_ops_t *smp_ops;
@@ -228,6 +231,8 @@ void __devinit smp_prepare_boot_cpu(void)
         BUG_ON(smp_processor_id() != boot_cpuid);
 
         cpu_set(boot_cpuid, cpu_online_map);
+        cpu_set(boot_cpuid, per_cpu(cpu_sibling_map, boot_cpuid));
+        cpu_set(boot_cpuid, per_cpu(cpu_core_map, boot_cpuid));
 #ifdef CONFIG_PPC64
         paca[boot_cpuid].__current = current;
 #endif
@@ -375,11 +380,60 @@ int __cpuinit __cpu_up(unsigned int cpu)
         return 0;
 }
 
+/* Return the value of the reg property corresponding to the given
+ * logical cpu.
+ */
+int cpu_to_core_id(int cpu)
+{
+        struct device_node *np;
+        const int *reg;
+        int id = -1;
+
+        np = of_get_cpu_node(cpu, NULL);
+        if (!np)
+                goto out;
+
+        reg = of_get_property(np, "reg", NULL);
+        if (!reg)
+                goto out;
+
+        id = *reg;
+out:
+        of_node_put(np);
+        return id;
+}
+
+/* Must be called when no change can occur to cpu_present_map,
+ * i.e. during cpu online or offline.
+ */
+static struct device_node *cpu_to_l2cache(int cpu)
+{
+        struct device_node *np;
+        const phandle *php;
+        phandle ph;
+
+        if (!cpu_present(cpu))
+                return NULL;
+
+        np = of_get_cpu_node(cpu, NULL);
+        if (np == NULL)
+                return NULL;
+
+        php = of_get_property(np, "l2-cache", NULL);
+        if (php == NULL)
+                return NULL;
+        ph = *php;
+        of_node_put(np);
+
+        return of_find_node_by_phandle(ph);
+}
 
 /* Activate a secondary processor. */
 int __devinit start_secondary(void *unused)
 {
         unsigned int cpu = smp_processor_id();
+        struct device_node *l2_cache;
+        int i, base;
 
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
@@ -400,6 +454,33 @@ int __devinit start_secondary(void *unused)
 
         ipi_call_lock();
         cpu_set(cpu, cpu_online_map);
+        /* Update sibling maps */
+        base = cpu_first_thread_in_core(cpu);
+        for (i = 0; i < threads_per_core; i++) {
+                if (cpu_is_offline(base + i))
+                        continue;
+                cpu_set(cpu, per_cpu(cpu_sibling_map, base + i));
+                cpu_set(base + i, per_cpu(cpu_sibling_map, cpu));
+
+                /* cpu_core_map should be a superset of
+                 * cpu_sibling_map even if we don't have cache
+                 * information, so update the former here, too.
+                 */
+                cpu_set(cpu, per_cpu(cpu_core_map, base +i));
+                cpu_set(base + i, per_cpu(cpu_core_map, cpu));
+        }
+        l2_cache = cpu_to_l2cache(cpu);
+        for_each_online_cpu(i) {
+                struct device_node *np = cpu_to_l2cache(i);
+                if (!np)
+                        continue;
+                if (np == l2_cache) {
+                        cpu_set(cpu, per_cpu(cpu_core_map, i));
+                        cpu_set(i, per_cpu(cpu_core_map, cpu));
+                }
+                of_node_put(np);
+        }
+        of_node_put(l2_cache);
         ipi_call_unlock();
 
         local_irq_enable();
@@ -437,10 +518,42 @@ void __init smp_cpus_done(unsigned int max_cpus)
 #ifdef CONFIG_HOTPLUG_CPU
 int __cpu_disable(void)
 {
-        if (smp_ops->cpu_disable)
-                return smp_ops->cpu_disable();
+        struct device_node *l2_cache;
+        int cpu = smp_processor_id();
+        int base, i;
+        int err;
 
-        return -ENOSYS;
+        if (!smp_ops->cpu_disable)
+                return -ENOSYS;
+
+        err = smp_ops->cpu_disable();
+        if (err)
+                return err;
+
+        /* Update sibling maps */
+        base = cpu_first_thread_in_core(cpu);
+        for (i = 0; i < threads_per_core; i++) {
+                cpu_clear(cpu, per_cpu(cpu_sibling_map, base + i));
+                cpu_clear(base + i, per_cpu(cpu_sibling_map, cpu));
+                cpu_clear(cpu, per_cpu(cpu_core_map, base +i));
+                cpu_clear(base + i, per_cpu(cpu_core_map, cpu));
+        }
+
+        l2_cache = cpu_to_l2cache(cpu);
+        for_each_present_cpu(i) {
+                struct device_node *np = cpu_to_l2cache(i);
+                if (!np)
+                        continue;
+                if (np == l2_cache) {
+                        cpu_clear(cpu, per_cpu(cpu_core_map, i));
+                        cpu_clear(i, per_cpu(cpu_core_map, cpu));
+                }
+                of_node_put(np);
+        }
+        of_node_put(l2_cache);
+
+
+        return 0;
 }
 
 void __cpu_die(unsigned int cpu)
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c
index f2589645870a..b0dbb1daa4df 100644
--- a/arch/powerpc/kernel/stacktrace.c
+++ b/arch/powerpc/kernel/stacktrace.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
-#include <linux/module.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 800e5e9a087b..56d172d16e56 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -22,6 +22,8 @@
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
+static DEFINE_PER_CPU(struct kobject *, cache_toplevel);
+
 /* SMT stuff */
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
@@ -297,8 +299,289 @@ static struct sysdev_attribute pa6t_attrs[] = {
 #endif /* CONFIG_DEBUG_KERNEL */
 };
 
+struct cache_desc {
+        struct kobject kobj;
+        struct cache_desc *next;
+        const char *type;       /* Instruction, Data, or Unified */
+        u32 size;               /* total cache size in KB */
+        u32 line_size;          /* in bytes */
+        u32 nr_sets;            /* number of sets */
+        u32 level;              /* e.g. 1, 2, 3... */
+        u32 associativity;      /* e.g. 8-way... 0 is fully associative */
+};
+
+DEFINE_PER_CPU(struct cache_desc *, cache_desc);
+
+static struct cache_desc *kobj_to_cache_desc(struct kobject *k)
+{
+        return container_of(k, struct cache_desc, kobj);
+}
+
+static void cache_desc_release(struct kobject *k)
+{
+        struct cache_desc *desc = kobj_to_cache_desc(k);
+
+        pr_debug("%s: releasing %s\n", __func__, kobject_name(k));
+
+        if (desc->next)
+                kobject_put(&desc->next->kobj);
+
+        kfree(kobj_to_cache_desc(k));
+}
+
+static ssize_t cache_desc_show(struct kobject *k, struct attribute *attr, char *buf)
+{
+        struct kobj_attribute *kobj_attr;
+
+        kobj_attr = container_of(attr, struct kobj_attribute, attr);
+
+        return kobj_attr->show(k, kobj_attr, buf);
+}
+
+static struct sysfs_ops cache_desc_sysfs_ops = {
+        .show = cache_desc_show,
+};
+
+static struct kobj_type cache_desc_type = {
+        .release = cache_desc_release,
+        .sysfs_ops = &cache_desc_sysfs_ops,
+};
+
+static ssize_t cache_size_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%uK\n", cache->size);
+}
+
+static struct kobj_attribute cache_size_attr =
+        __ATTR(size, 0444, cache_size_show, NULL);
+
+static ssize_t cache_line_size_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%u\n", cache->line_size);
+}
+
+static struct kobj_attribute cache_line_size_attr =
+        __ATTR(coherency_line_size, 0444, cache_line_size_show, NULL);
+
+static ssize_t cache_nr_sets_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%u\n", cache->nr_sets);
+}
+
+static struct kobj_attribute cache_nr_sets_attr =
+        __ATTR(number_of_sets, 0444, cache_nr_sets_show, NULL);
+
+static ssize_t cache_type_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%s\n", cache->type);
+}
+
+static struct kobj_attribute cache_type_attr =
+        __ATTR(type, 0444, cache_type_show, NULL);
+
+static ssize_t cache_level_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%u\n", cache->level);
+}
+
+static struct kobj_attribute cache_level_attr =
+        __ATTR(level, 0444, cache_level_show, NULL);
+
+static ssize_t cache_assoc_show(struct kobject *k, struct kobj_attribute *attr, char *buf)
+{
+        struct cache_desc *cache = kobj_to_cache_desc(k);
+
+        return sprintf(buf, "%u\n", cache->associativity);
+}
+
+static struct kobj_attribute cache_assoc_attr =
+        __ATTR(ways_of_associativity, 0444, cache_assoc_show, NULL);
+
+struct cache_desc_info {
+        const char *type;
+        const char *size_prop;
+        const char *line_size_prop;
+        const char *nr_sets_prop;
+};
+
+/* PowerPC Processor binding says the [di]-cache-* must be equal on
+ * unified caches, so just use d-cache properties. */
+static struct cache_desc_info ucache_info = {
+        .type = "Unified",
+        .size_prop = "d-cache-size",
+        .line_size_prop = "d-cache-line-size",
+        .nr_sets_prop = "d-cache-sets",
+};
 
-static void register_cpu_online(unsigned int cpu)
+static struct cache_desc_info dcache_info = {
+        .type = "Data",
+        .size_prop = "d-cache-size",
+        .line_size_prop = "d-cache-line-size",
+        .nr_sets_prop = "d-cache-sets",
+};
+
+static struct cache_desc_info icache_info = {
+        .type = "Instruction",
+        .size_prop = "i-cache-size",
+        .line_size_prop = "i-cache-line-size",
+        .nr_sets_prop = "i-cache-sets",
+};
+
+static struct cache_desc * __cpuinit create_cache_desc(struct device_node *np, struct kobject *parent, int index, int level, struct cache_desc_info *info)
+{
+        const u32 *cache_line_size;
+        struct cache_desc *new;
+        const u32 *cache_size;
+        const u32 *nr_sets;
+        int rc;
+
+        new = kzalloc(sizeof(*new), GFP_KERNEL);
+        if (!new)
+                return NULL;
+
+        rc = kobject_init_and_add(&new->kobj, &cache_desc_type, parent,
+                                  "index%d", index);
+        if (rc)
+                goto err;
+
+        /* type */
+        new->type = info->type;
+        rc = sysfs_create_file(&new->kobj, &cache_type_attr.attr);
+        WARN_ON(rc);
+
+        /* level */
+        new->level = level;
+        rc = sysfs_create_file(&new->kobj, &cache_level_attr.attr);
+        WARN_ON(rc);
+
+        /* size */
+        cache_size = of_get_property(np, info->size_prop, NULL);
+        if (cache_size) {
+                new->size = *cache_size / 1024;
+                rc = sysfs_create_file(&new->kobj,
+                                       &cache_size_attr.attr);
+                WARN_ON(rc);
+        }
+
+        /* coherency_line_size */
+        cache_line_size = of_get_property(np, info->line_size_prop, NULL);
+        if (cache_line_size) {
+                new->line_size = *cache_line_size;
+                rc = sysfs_create_file(&new->kobj,
+                                       &cache_line_size_attr.attr);
+                WARN_ON(rc);
+        }
+
+        /* number_of_sets */
+        nr_sets = of_get_property(np, info->nr_sets_prop, NULL);
+        if (nr_sets) {
+                new->nr_sets = *nr_sets;
+                rc = sysfs_create_file(&new->kobj,
+                                       &cache_nr_sets_attr.attr);
+                WARN_ON(rc);
+        }
+
+        /* ways_of_associativity */
+        if (new->nr_sets == 1) {
+                /* fully associative */
+                new->associativity = 0;
+                goto create_assoc;
+        }
+
+        if (new->nr_sets && new->size && new->line_size) {
+                /* If we have values for all of these we can derive
+                 * the associativity. */
+                new->associativity =
+                        ((new->size * 1024) / new->nr_sets) / new->line_size;
+create_assoc:
+                rc = sysfs_create_file(&new->kobj,
+                                       &cache_assoc_attr.attr);
+                WARN_ON(rc);
+        }
+
+        return new;
+err:
+        kfree(new);
+        return NULL;
+}
+
+static bool cache_is_unified(struct device_node *np)
+{
+        return of_get_property(np, "cache-unified", NULL);
+}
+
+static struct cache_desc * __cpuinit create_cache_index_info(struct device_node *np, struct kobject *parent, int index, int level)
+{
+        const phandle *next_cache_phandle;
+        struct device_node *next_cache;
+        struct cache_desc *new, **end;
+
+        pr_debug("%s(node = %s, index = %d)\n", __func__, np->full_name, index);
+
+        if (cache_is_unified(np)) {
+                new = create_cache_desc(np, parent, index, level,
+                                        &ucache_info);
+        } else {
+                new = create_cache_desc(np, parent, index, level,
+                                        &dcache_info);
+                if (new) {
+                        index++;
+                        new->next = create_cache_desc(np, parent, index, level,
+                                                      &icache_info);
+                }
+        }
+        if (!new)
+                return NULL;
+
+        end = &new->next;
+        while (*end)
+                end = &(*end)->next;
+
+        next_cache_phandle = of_get_property(np, "l2-cache", NULL);
+        if (!next_cache_phandle)
+                goto out;
+
+        next_cache = of_find_node_by_phandle(*next_cache_phandle);
+        if (!next_cache)
+                goto out;
+
+        *end = create_cache_index_info(next_cache, parent, ++index, ++level);
+
+        of_node_put(next_cache);
+out:
+        return new;
+}
+
+static void __cpuinit create_cache_info(struct sys_device *sysdev)
+{
+        struct kobject *cache_toplevel;
+        struct device_node *np = NULL;
+        int cpu = sysdev->id;
+
+        cache_toplevel = kobject_create_and_add("cache", &sysdev->kobj);
+        if (!cache_toplevel)
+                return;
+        per_cpu(cache_toplevel, cpu) = cache_toplevel;
+        np = of_get_cpu_node(cpu, NULL);
+        if (np != NULL) {
+                per_cpu(cache_desc, cpu) =
+                        create_cache_index_info(np, cache_toplevel, 0, 1);
+                of_node_put(np);
+        }
+        return;
+}
+
+static void __cpuinit register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
@@ -346,9 +629,33 @@ static void register_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_DSCR))
                 sysdev_create_file(s, &attr_dscr);
+
+        create_cache_info(s);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
+static void remove_cache_info(struct sys_device *sysdev)
+{
+        struct kobject *cache_toplevel;
+        struct cache_desc *cache_desc;
+        int cpu = sysdev->id;
+
+        cache_desc = per_cpu(cache_desc, cpu);
+        if (cache_desc != NULL) {
+                sysfs_remove_file(&cache_desc->kobj, &cache_size_attr.attr);
+                sysfs_remove_file(&cache_desc->kobj, &cache_line_size_attr.attr);
+                sysfs_remove_file(&cache_desc->kobj, &cache_type_attr.attr);
+                sysfs_remove_file(&cache_desc->kobj, &cache_level_attr.attr);
+                sysfs_remove_file(&cache_desc->kobj, &cache_nr_sets_attr.attr);
+                sysfs_remove_file(&cache_desc->kobj, &cache_assoc_attr.attr);
+
+                kobject_put(&cache_desc->kobj);
+        }
+        cache_toplevel = per_cpu(cache_toplevel, cpu);
+        if (cache_toplevel != NULL)
+                kobject_put(cache_toplevel);
+}
+
 static void unregister_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
@@ -399,6 +706,8 @@ static void unregister_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_DSCR))
                 sysdev_remove_file(s, &attr_dscr);
+
+        remove_cache_info(s);
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index ade8aeaa2e70..22a3c33fd751 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -530,7 +530,7 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr,
         }
 
         ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs);
-        if (unlikely(dma_mapping_error(ret))) {
+        if (unlikely(dma_mapping_error(dev, ret))) {
                 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));
                 atomic_inc(&viodev->cmo.allocs_failed);
         }
@@ -1031,8 +1031,8 @@ void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired) {}
 static int vio_cmo_bus_probe(struct vio_dev *viodev) { return 0; }
 static void vio_cmo_bus_remove(struct vio_dev *viodev) {}
 static void vio_cmo_set_dma_ops(struct vio_dev *viodev) {}
-static void vio_cmo_bus_init() {}
-static void vio_cmo_sysfs_init() { }
+static void vio_cmo_bus_init(void) {}
+static void vio_cmo_sysfs_init(void) { }
 #endif /* CONFIG_PPC_SMLPAR */
 EXPORT_SYMBOL(vio_cmo_entitlement_update);
 EXPORT_SYMBOL(vio_cmo_set_dev_desired);
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index 75dff7cfa814..5a5602da5091 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -177,7 +177,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid,
                                                     vcpu->arch.msr & MSR_PR);
 }
 
-void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, u64 eaddr, u64 asid)
+void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,
+                           gva_t eend, u32 asid)
 {
         unsigned int pid = asid & 0xff;
         int i;
@@ -191,7 +192,7 @@ void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, u64 eaddr, u64 asid)
                 if (!get_tlb_v(stlbe))
                         continue;
 
-                if (eaddr < get_tlb_eaddr(stlbe))
+                if (eend < get_tlb_eaddr(stlbe))
                         continue;
 
                 if (eaddr > get_tlb_end(stlbe))
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 000097461283..8c605d0a5488 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -137,7 +137,7 @@ static int kvmppc_emul_tlbwe(struct kvm_vcpu *vcpu, u32 inst)
         if (tlbe->word0 & PPC44x_TLB_VALID) {
                 eaddr = get_tlb_eaddr(tlbe);
                 asid = (tlbe->word0 & PPC44x_TLB_TS) | tlbe->tid;
-                kvmppc_mmu_invalidate(vcpu, eaddr, asid);
+                kvmppc_mmu_invalidate(vcpu, eaddr, get_tlb_end(tlbe), asid);
         }
 
         switch (ws) {
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index ed0aab0208a6..f1c2d55b4377 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -736,14 +736,21 @@ static int __init hugetlbpage_init(void)
 
         if (!cpu_has_feature(CPU_FTR_16M_PAGE))
                 return -ENODEV;
+
         /* Add supported huge page sizes.  Need to change HUGE_MAX_HSTATE
          * and adjust PTE_NONCACHE_NUM if the number of supported huge page
          * sizes changes.
          */
         set_huge_psize(MMU_PAGE_16M);
-        set_huge_psize(MMU_PAGE_64K);
         set_huge_psize(MMU_PAGE_16G);
 
+        /* Temporarily disable support for 64K huge pages when 64K SPU local
+         * store support is enabled as the current implementation conflicts.
+         */
+#ifndef CONFIG_SPU_FS_64K_LS
+        set_huge_psize(MMU_PAGE_64K);
+#endif
+
         for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {
                 if (mmu_huge_psizes[psize]) {
                         huge_pgtable_cache(psize) = kmem_cache_create(
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 31635446901a..88ccf3a08a9c 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -541,6 +541,78 @@ static int __init pmac_declare_of_platform_devices(void)
 }
 machine_device_initcall(powermac, pmac_declare_of_platform_devices);
 
+#ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE
+/*
+ * This is called very early, as part of console_init() (typically just after
+ * time_init()). This function is respondible for trying to find a good
+ * default console on serial ports. It tries to match the open firmware
+ * default output with one of the available serial console drivers.
+ */
+static int __init check_pmac_serial_console(void)
+{
+        struct device_node *prom_stdout = NULL;
+        int offset = 0;
+        const char *name;
+#ifdef CONFIG_SERIAL_PMACZILOG_TTYS
+        char *devname = "ttyS";
+#else
+        char *devname = "ttyPZ";
+#endif
+
+        pr_debug(" -> check_pmac_serial_console()\n");
+
+        /* The user has requested a console so this is already set up. */
+        if (strstr(boot_command_line, "console=")) {
+                pr_debug(" console was specified !\n");
+                return -EBUSY;
+        }
+
+        if (!of_chosen) {
+                pr_debug(" of_chosen is NULL !\n");
+                return -ENODEV;
+        }
+
+        /* We are getting a weird phandle from OF ... */
+        /* ... So use the full path instead */
+        name = of_get_property(of_chosen, "linux,stdout-path", NULL);
+        if (name == NULL) {
+                pr_debug(" no linux,stdout-path !\n");
+                return -ENODEV;
+        }
+        prom_stdout = of_find_node_by_path(name);
+        if (!prom_stdout) {
+                pr_debug(" can't find stdout package %s !\n", name);
+                return -ENODEV;
+        }
+        pr_debug("stdout is %s\n", prom_stdout->full_name);
+
+        name = of_get_property(prom_stdout, "name", NULL);
+        if (!name) {
+                pr_debug(" stdout package has no name !\n");
+                goto not_found;
+        }
+
+        if (strcmp(name, "ch-a") == 0)
+                offset = 0;
+        else if (strcmp(name, "ch-b") == 0)
+                offset = 1;
+        else
+                goto not_found;
+        of_node_put(prom_stdout);
+
+        pr_debug("Found serial console at %s%d\n", devname, offset);
+
+        return add_preferred_console(devname, offset, NULL);
+
+ not_found:
+        pr_debug("No preferred console found !\n");
+        of_node_put(prom_stdout);
+        return -ENODEV;
+}
+console_initcall(check_pmac_serial_console);
+
+#endif /* CONFIG_SERIAL_PMACZILOG_CONSOLE */
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index 47de4d3fc167..572771fd8463 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -125,13 +125,23 @@ void udbg_scc_init(int force_scc)
         out_8(sccc, 0xc0);
 
         /* If SCC was the OF output port, read the BRG value, else
-         * Setup for 57600 8N1
+         * Setup for 38400 or 57600 8N1 depending on the machine
          */
         if (ch_def != NULL) {
                 out_8(sccc, 13);
                 scc_inittab[1] = in_8(sccc);
                 out_8(sccc, 12);
                 scc_inittab[3] = in_8(sccc);
+        } else if (machine_is_compatible("RackMac1,1")
+                   || machine_is_compatible("RackMac1,2")
+                   || machine_is_compatible("MacRISC4")) {
+                /* Xserves and G5s default to 57600 */
+                scc_inittab[1] = 0;
+                scc_inittab[3] = 0;
+        } else {
+                /* Others default to 38400 */
+                scc_inittab[1] = 0;
+                scc_inittab[3] = 1;
         }
 
         for (i = 0; i < sizeof(scc_inittab); ++i)
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index c6b3be03168b..38fe32a7cc70 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -289,7 +289,9 @@ static int cmm_thread(void *dummy)
 }
 
 #define CMM_SHOW(name, format, args...)                 \
-        static ssize_t show_##name(struct sys_device *dev, char *buf)   \
+        static ssize_t show_##name(struct sys_device *dev,      \
+                                   struct sysdev_attribute *attr,       \
+                                   char *buf)                   \
         {                                                       \
                 return sprintf(buf, format, ##args);            \
         }                                                       \
@@ -298,12 +300,14 @@ static int cmm_thread(void *dummy)
 CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages));
 CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target));
 
-static ssize_t show_oom_pages(struct sys_device *dev, char *buf)
+static ssize_t show_oom_pages(struct sys_device *dev,
+                              struct sysdev_attribute *attr, char *buf)
 {
         return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages));
 }
 
 static ssize_t store_oom_pages(struct sys_device *dev,
+                               struct sysdev_attribute *attr,
                                const char *buf, size_t count)
 {
         unsigned long val = simple_strtoul (buf, NULL, 10);
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 4f82e5b5f879..569079ec4ff0 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -197,7 +197,7 @@ void __kprobes arch_arm_kprobe(struct kprobe *p)
         args.new = BREAKPOINT_INSTRUCTION;
 
         kcb->kprobe_status = KPROBE_SWAP_INST;
-        stop_machine_run(swap_instruction, &args, NR_CPUS);
+        stop_machine(swap_instruction, &args, NULL);
         kcb->kprobe_status = status;
 }
 
@@ -212,7 +212,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
         args.new = p->opcode;
 
         kcb->kprobe_status = KPROBE_SWAP_INST;
-        stop_machine_run(swap_instruction, &args, NR_CPUS);
+        stop_machine(swap_instruction, &args, NULL);
         kcb->kprobe_status = status;
 }
 
@@ -331,7 +331,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                  * No kprobe at this address. The fault has not been
                  * caused by a kprobe breakpoint. The race of breakpoint
                  * vs. kprobe remove does not exist because on s390 we
-                 * use stop_machine_run to arm/disarm the breakpoints.
+                 * use stop_machine to arm/disarm the breakpoints.
                  */
                 goto no_kprobe;
 
diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
index 4e0633c413f3..ed60f3a74a85 100644
--- a/arch/s390/kvm/gaccess.h
+++ b/arch/s390/kvm/gaccess.h
@@ -18,11 +18,11 @@
 #include <asm/uaccess.h>
 
 static inline void __user *__guestaddr_to_user(struct kvm_vcpu *vcpu,
-                                               u64 guestaddr)
+                                               unsigned long guestaddr)
 {
-        u64 prefix  = vcpu->arch.sie_block->prefix;
-        u64 origin  = vcpu->kvm->arch.guest_origin;
-        u64 memsize = vcpu->kvm->arch.guest_memsize;
+        unsigned long prefix  = vcpu->arch.sie_block->prefix;
+        unsigned long origin  = vcpu->kvm->arch.guest_origin;
+        unsigned long memsize = vcpu->kvm->arch.guest_memsize;
 
         if (guestaddr < 2 * PAGE_SIZE)
                 guestaddr += prefix;
@@ -37,7 +37,7 @@ static inline void __user *__guestaddr_to_user(struct kvm_vcpu *vcpu,
         return (void __user *) guestaddr;
 }
 
-static inline int get_guest_u64(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int get_guest_u64(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u64 *result)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -47,10 +47,10 @@ static inline int get_guest_u64(struct kvm_vcpu *vcpu, u64 guestaddr,
         if (IS_ERR((void __force *) uptr))
                 return PTR_ERR((void __force *) uptr);
 
-        return get_user(*result, (u64 __user *) uptr);
+        return get_user(*result, (unsigned long __user *) uptr);
 }
 
-static inline int get_guest_u32(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int get_guest_u32(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u32 *result)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -63,7 +63,7 @@ static inline int get_guest_u32(struct kvm_vcpu *vcpu, u64 guestaddr,
         return get_user(*result, (u32 __user *) uptr);
 }
 
-static inline int get_guest_u16(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int get_guest_u16(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u16 *result)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -76,7 +76,7 @@ static inline int get_guest_u16(struct kvm_vcpu *vcpu, u64 guestaddr,
         return get_user(*result, (u16 __user *) uptr);
 }
 
-static inline int get_guest_u8(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int get_guest_u8(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                u8 *result)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -87,7 +87,7 @@ static inline int get_guest_u8(struct kvm_vcpu *vcpu, u64 guestaddr,
         return get_user(*result, (u8 __user *) uptr);
 }
 
-static inline int put_guest_u64(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int put_guest_u64(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u64 value)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -100,7 +100,7 @@ static inline int put_guest_u64(struct kvm_vcpu *vcpu, u64 guestaddr,
         return put_user(value, (u64 __user *) uptr);
 }
 
-static inline int put_guest_u32(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int put_guest_u32(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u32 value)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -113,7 +113,7 @@ static inline int put_guest_u32(struct kvm_vcpu *vcpu, u64 guestaddr,
         return put_user(value, (u32 __user *) uptr);
 }
 
-static inline int put_guest_u16(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int put_guest_u16(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                 u16 value)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -126,7 +126,7 @@ static inline int put_guest_u16(struct kvm_vcpu *vcpu, u64 guestaddr,
         return put_user(value, (u16 __user *) uptr);
 }
 
-static inline int put_guest_u8(struct kvm_vcpu *vcpu, u64 guestaddr,
+static inline int put_guest_u8(struct kvm_vcpu *vcpu, unsigned long guestaddr,
                                u8 value)
 {
         void __user *uptr = __guestaddr_to_user(vcpu, guestaddr);
@@ -138,7 +138,8 @@ static inline int put_guest_u8(struct kvm_vcpu *vcpu, u64 guestaddr,
 }
 
 
-static inline int __copy_to_guest_slow(struct kvm_vcpu *vcpu, u64 guestdest,
+static inline int __copy_to_guest_slow(struct kvm_vcpu *vcpu,
+                                       unsigned long guestdest,
                                        const void *from, unsigned long n)
 {
         int rc;
@@ -153,12 +154,12 @@ static inline int __copy_to_guest_slow(struct kvm_vcpu *vcpu, u64 guestdest,
         return 0;
 }
 
-static inline int copy_to_guest(struct kvm_vcpu *vcpu, u64 guestdest,
+static inline int copy_to_guest(struct kvm_vcpu *vcpu, unsigned long guestdest,
                                 const void *from, unsigned long n)
 {
-        u64 prefix  = vcpu->arch.sie_block->prefix;
-        u64 origin  = vcpu->kvm->arch.guest_origin;
-        u64 memsize = vcpu->kvm->arch.guest_memsize;
+        unsigned long prefix  = vcpu->arch.sie_block->prefix;
+        unsigned long origin  = vcpu->kvm->arch.guest_origin;
+        unsigned long memsize = vcpu->kvm->arch.guest_memsize;
 
         if ((guestdest < 2 * PAGE_SIZE) && (guestdest + n > 2 * PAGE_SIZE))
                 goto slowpath;
@@ -189,7 +190,8 @@ slowpath:
 }
 
 static inline int __copy_from_guest_slow(struct kvm_vcpu *vcpu, void *to,
-                                         u64 guestsrc, unsigned long n)
+                                         unsigned long guestsrc,
+                                         unsigned long n)
 {
         int rc;
         unsigned long i;
@@ -204,11 +206,11 @@ static inline int __copy_from_guest_slow(struct kvm_vcpu *vcpu, void *to,
 }
 
 static inline int copy_from_guest(struct kvm_vcpu *vcpu, void *to,
-                                  u64 guestsrc, unsigned long n)
+                                  unsigned long guestsrc, unsigned long n)
 {
-        u64 prefix  = vcpu->arch.sie_block->prefix;
-        u64 origin  = vcpu->kvm->arch.guest_origin;
-        u64 memsize = vcpu->kvm->arch.guest_memsize;
+        unsigned long prefix  = vcpu->arch.sie_block->prefix;
+        unsigned long origin  = vcpu->kvm->arch.guest_origin;
+        unsigned long memsize = vcpu->kvm->arch.guest_memsize;
 
         if ((guestsrc < 2 * PAGE_SIZE) && (guestsrc + n > 2 * PAGE_SIZE))
                 goto slowpath;
@@ -238,11 +240,12 @@ slowpath:
         return __copy_from_guest_slow(vcpu, to, guestsrc, n);
 }
 
-static inline int copy_to_guest_absolute(struct kvm_vcpu *vcpu, u64 guestdest,
+static inline int copy_to_guest_absolute(struct kvm_vcpu *vcpu,
+                                         unsigned long guestdest,
                                          const void *from, unsigned long n)
 {
-        u64 origin  = vcpu->kvm->arch.guest_origin;
-        u64 memsize = vcpu->kvm->arch.guest_memsize;
+        unsigned long origin  = vcpu->kvm->arch.guest_origin;
+        unsigned long memsize = vcpu->kvm->arch.guest_memsize;
 
         if (guestdest + n > memsize)
                 return -EFAULT;
@@ -256,10 +259,11 @@ static inline int copy_to_guest_absolute(struct kvm_vcpu *vcpu, u64 guestdest,
 }
 
 static inline int copy_from_guest_absolute(struct kvm_vcpu *vcpu, void *to,
-                                           u64 guestsrc, unsigned long n)
+                                           unsigned long guestsrc,
+                                           unsigned long n)
 {
-        u64 origin  = vcpu->kvm->arch.guest_origin;
-        u64 memsize = vcpu->kvm->arch.guest_memsize;
+        unsigned long origin  = vcpu->kvm->arch.guest_origin;
+        unsigned long memsize = vcpu->kvm->arch.guest_memsize;
 
         if (guestsrc + n > memsize)
                 return -EFAULT;
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 47a0b642174c..61236102203e 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -20,7 +20,7 @@
 #include "kvm-s390.h"
 #include "gaccess.h"
 
-static int handle_lctg(struct kvm_vcpu *vcpu)
+static int handle_lctlg(struct kvm_vcpu *vcpu)
 {
         int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4;
         int reg3 = vcpu->arch.sie_block->ipa & 0x000f;
@@ -30,7 +30,7 @@ static int handle_lctg(struct kvm_vcpu *vcpu)
         u64 useraddr;
         int reg, rc;
 
-        vcpu->stat.instruction_lctg++;
+        vcpu->stat.instruction_lctlg++;
         if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f)
                 return -ENOTSUPP;
 
@@ -38,9 +38,12 @@ static int handle_lctg(struct kvm_vcpu *vcpu)
         if (base2)
                 useraddr += vcpu->arch.guest_gprs[base2];
 
+        if (useraddr & 7)
+                return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
+
         reg = reg1;
 
-        VCPU_EVENT(vcpu, 5, "lctg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,
+        VCPU_EVENT(vcpu, 5, "lctlg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,
                    disp2);
 
         do {
@@ -74,6 +77,9 @@ static int handle_lctl(struct kvm_vcpu *vcpu)
         if (base2)
                 useraddr += vcpu->arch.guest_gprs[base2];
 
+        if (useraddr & 3)
+                return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
+
         VCPU_EVENT(vcpu, 5, "lctl r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,
                    disp2);
 
@@ -99,7 +105,7 @@ static intercept_handler_t instruction_handlers[256] = {
         [0xae] = kvm_s390_handle_sigp,
         [0xb2] = kvm_s390_handle_priv,
         [0xb7] = handle_lctl,
-        [0xeb] = handle_lctg,
+        [0xeb] = handle_lctlg,
 };
 
 static int handle_noop(struct kvm_vcpu *vcpu)
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 11230b0db957..2960702b4824 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -13,6 +13,7 @@
 #include <asm/lowcore.h>
 #include <asm/uaccess.h>
 #include <linux/kvm_host.h>
+#include <linux/signal.h>
 #include "kvm-s390.h"
 #include "gaccess.h"
 
@@ -246,15 +247,10 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,
         default:
                 BUG();
         }
-
         if (exception) {
-                VCPU_EVENT(vcpu, 1, "%s", "program exception while delivering"
-                           " interrupt");
-                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
-                if (inti->type == KVM_S390_PROGRAM_INT) {
-                        printk(KERN_WARNING "kvm: recursive program check\n");
-                        BUG();
-                }
+                printk("kvm: The guest lowcore is not mapped during interrupt "
+                        "delivery, killing userspace\n");
+                do_exit(SIGKILL);
         }
 }
 
@@ -277,14 +273,11 @@ static int __try_deliver_ckc_interrupt(struct kvm_vcpu *vcpu)
                 __LC_EXT_NEW_PSW, sizeof(psw_t));
         if (rc == -EFAULT)
                 exception = 1;
-
         if (exception) {
-                VCPU_EVENT(vcpu, 1, "%s", "program exception while delivering" \
-                           " ckc interrupt");
-                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
-                return 0;
+                printk("kvm: The guest lowcore is not mapped during interrupt "
+                        "delivery, killing userspace\n");
+                do_exit(SIGKILL);
         }
-
         return 1;
 }
 
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 1782cbcd2829..8b00eb2ddf57 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -39,7 +39,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "exit_instruction", VCPU_STAT(exit_instruction) },
         { "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
         { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
-        { "instruction_lctg", VCPU_STAT(instruction_lctg) },
+        { "instruction_lctlg", VCPU_STAT(instruction_lctlg) },
         { "instruction_lctl", VCPU_STAT(instruction_lctl) },
         { "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) },
         { "deliver_service_signal", VCPU_STAT(deliver_service_signal) },
@@ -112,7 +112,12 @@ long kvm_arch_dev_ioctl(struct file *filp,
 
 int kvm_dev_ioctl_check_extension(long ext)
 {
-        return 0;
+        switch (ext) {
+        case KVM_CAP_USER_MEMORY:
+                return 1;
+        default:
+                return 0;
+        }
 }
 
 /* Section: vm related */
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index 5a556114eaa5..170392687ce0 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -43,7 +43,8 @@
 #define SIGP_STAT_RECEIVER_CHECK    0x00000001UL
 
 
-static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr, u64 *reg)
+static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,
+                        unsigned long *reg)
 {
         struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
         int rc;
@@ -167,7 +168,7 @@ static int __sigp_set_arch(struct kvm_vcpu *vcpu, u32 parameter)
 }
 
 static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
-                             u64 *reg)
+                             unsigned long *reg)
 {
         struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
         struct kvm_s390_local_interrupt *li;
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8879938f3356..0b88dc462d73 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -11,6 +11,7 @@ config SUPERH
         select HAVE_CLK
         select HAVE_IDE
         select HAVE_OPROFILE
+        select HAVE_GENERIC_DMA_COHERENT
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -477,6 +478,10 @@ config SH_RTS7751R2D
           Select RTS7751R2D if configuring for a Renesas Technology
           Sales SH-Graphics board.
 
+config SH_RSK7203
+        bool "RSK7203"
+        depends on CPU_SUBTYPE_SH7203
+
 config SH_SDK7780
         bool "SDK7780R3"
         depends on CPU_SUBTYPE_SH7780
@@ -491,6 +496,21 @@ config SH_HIGHLANDER
         select SYS_SUPPORTS_PCI
         select IO_TRAPPED
 
+config SH_SH7785LCR
+        bool "SH7785LCR"
+        depends on CPU_SUBTYPE_SH7785
+        select SYS_SUPPORTS_PCI
+        select IO_TRAPPED
+
+config SH_SH7785LCR_29BIT_PHYSMAPS
+        bool "SH7785LCR 29bit physmaps"
+        depends on SH_SH7785LCR
+        default y
+        help
+          This board has 2 physical memory maps. It can be changed with
+          DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
+          you can access all on-board device in 29bit address mode.
+
 config SH_MIGOR
         bool "Migo-R"
         depends on CPU_SUBTYPE_SH7722
@@ -498,6 +518,20 @@ config SH_MIGOR
           Select Migo-R if configuring for the SH7722 Migo-R platform
           by Renesas System Solutions Asia Pte. Ltd.
 
+config SH_AP325RXA
+        bool "AP-325RXA"
+        depends on CPU_SUBTYPE_SH7723
+        help
+          Renesas "AP-325RXA" support.
+          Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
+
+config SH_SH7763RDP
+        bool "SH7763RDP"
+        depends on CPU_SUBTYPE_SH7763
+        help
+          Select SH7763RDP if configuring for a Renesas SH7763
+          evaluation board.
+
 config SH_EDOSK7705
         bool "EDOSK7705"
         depends on CPU_SUBTYPE_SH7705
@@ -559,6 +593,7 @@ endmenu
 source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 source "arch/sh/boards/renesas/r7780rp/Kconfig"
 source "arch/sh/boards/renesas/sdk7780/Kconfig"
+source "arch/sh/boards/renesas/migor/Kconfig"
 source "arch/sh/boards/magicpanelr2/Kconfig"
 
 menu "Timer and clock configuration"
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 0f4549860226..36f4b1f7066d 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -36,7 +36,8 @@ config EARLY_SCIF_CONSOLE_PORT
         default "0xff804000" if CPU_SUBTYPE_MXG
         default "0xffc30000" if CPU_SUBTYPE_SHX3
         default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \
-                                CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366
+                                CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \
+                                CPU_SUBTYPE_SH7343
         default "0xffe80000" if CPU_SH4
         default "0xffea0000" if CPU_SUBTYPE_SH7785
         default "0xfffe8000" if CPU_SUBTYPE_SH7203
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index fb7b1b15e392..c627e45c4df7 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -121,6 +121,10 @@ machdir-$(CONFIG_SH_HIGHLANDER)			+= renesas/r7780rp
 machdir-$(CONFIG_SH_MIGOR)                      += renesas/migor
 machdir-$(CONFIG_SH_SDK7780)                    += renesas/sdk7780
 machdir-$(CONFIG_SH_X3PROTO)                    += renesas/x3proto
+machdir-$(CONFIG_SH_RSK7203)                    += renesas/rsk7203
+machdir-$(CONFIG_SH_AP325RXA)                   += renesas/ap325rxa
+machdir-$(CONFIG_SH_SH7763RDP)                  += renesas/sh7763rdp
+machdir-$(CONFIG_SH_SH7785LCR)                  += renesas/sh7785lcr
 machdir-$(CONFIG_SH_SH4202_MICRODEV)            += superh/microdev
 machdir-$(CONFIG_SH_LANDISK)                    += landisk
 machdir-$(CONFIG_SH_TITAN)                      += titan
diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/dreamcast/rtc.c
index b3a876a3b859..a7433685798d 100644
--- a/arch/sh/boards/dreamcast/rtc.c
+++ b/arch/sh/boards/dreamcast/rtc.c
@@ -30,7 +30,7 @@
  *
  * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.
  */
-void aica_rtc_gettimeofday(struct timespec *ts)
+static void aica_rtc_gettimeofday(struct timespec *ts)
 {
         unsigned long val1, val2;
 
@@ -54,7 +54,7 @@ void aica_rtc_gettimeofday(struct timespec *ts)
  *
  * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.
  */
-int aica_rtc_settimeofday(const time_t secs)
+static int aica_rtc_settimeofday(const time_t secs)
 {
         unsigned long val1, val2;
         unsigned long adj = secs + TWENTY_YEARS;
diff --git a/arch/sh/boards/renesas/ap325rxa/Makefile b/arch/sh/boards/renesas/ap325rxa/Makefile
new file mode 100644
index 000000000000..f663768429f0
--- /dev/null
+++ b/arch/sh/boards/renesas/ap325rxa/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o
diff --git a/arch/sh/boards/renesas/ap325rxa/setup.c b/arch/sh/boards/renesas/ap325rxa/setup.c
new file mode 100644
index 000000000000..7fa74462bd9f
--- /dev/null
+++ b/arch/sh/boards/renesas/ap325rxa/setup.c
@@ -0,0 +1,313 @@
+/*
+ * Renesas - AP-325RXA
+ * (Compatible with Algo System ., LTD. - AP-320A)
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Author : Yusuke Goda <goda.yuske@renesas.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/smc911x.h>
+#include <media/soc_camera_platform.h>
+#include <media/sh_mobile_ceu.h>
+#include <asm/sh_mobile_lcdc.h>
+#include <asm/io.h>
+#include <asm/clock.h>
+
+static struct smc911x_platdata smc911x_info = {
+        .flags = SMC911X_USE_32BIT,
+        .irq_flags = IRQF_TRIGGER_LOW,
+};
+
+static struct resource smc9118_resources[] = {
+        [0] = {
+                .start  = 0xb6080000,
+                .end    = 0xb60fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 35,
+                .end    = 35,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device smc9118_device = {
+        .name           = "smc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc9118_resources),
+        .resource       = smc9118_resources,
+        .dev            = {
+                .platform_data = &smc911x_info,
+        },
+};
+
+static struct mtd_partition ap325rxa_nor_flash_partitions[] = {
+        {
+                 .name = "uboot",
+                 .offset = 0,
+                 .size = (1 * 1024 * 1024),
+                 .mask_flags = MTD_WRITEABLE,   /* Read-only */
+        }, {
+                 .name = "kernel",
+                 .offset = MTDPART_OFS_APPEND,
+                 .size = (2 * 1024 * 1024),
+        }, {
+                 .name = "other",
+                 .offset = MTDPART_OFS_APPEND,
+                 .size = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct physmap_flash_data ap325rxa_nor_flash_data = {
+        .width          = 2,
+        .parts          = ap325rxa_nor_flash_partitions,
+        .nr_parts       = ARRAY_SIZE(ap325rxa_nor_flash_partitions),
+};
+
+static struct resource ap325rxa_nor_flash_resources[] = {
+        [0] = {
+                .name   = "NOR Flash",
+                .start  = 0x00000000,
+                .end    = 0x00ffffff,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device ap325rxa_nor_flash_device = {
+        .name           = "physmap-flash",
+        .resource       = ap325rxa_nor_flash_resources,
+        .num_resources  = ARRAY_SIZE(ap325rxa_nor_flash_resources),
+        .dev            = {
+                .platform_data = &ap325rxa_nor_flash_data,
+        },
+};
+
+#define FPGA_LCDREG     0xB4100180
+#define FPGA_BKLREG     0xB4100212
+#define FPGA_LCDREG_VAL 0x0018
+#define PORT_PHCR       0xA405010E
+#define PORT_PLCR       0xA4050114
+#define PORT_PMCR       0xA4050116
+#define PORT_PRCR       0xA405011C
+#define PORT_PSCR       0xA405011E
+#define PORT_PZCR       0xA405014C
+#define PORT_HIZCRA     0xA4050158
+#define PORT_MSELCRB    0xA4050182
+#define PORT_PSDR       0xA405013E
+#define PORT_PZDR       0xA405016C
+#define PORT_PSELD      0xA4050154
+
+static void ap320_wvga_power_on(void *board_data)
+{
+        msleep(100);
+
+        /* ASD AP-320/325 LCD ON */
+        ctrl_outw(FPGA_LCDREG_VAL, FPGA_LCDREG);
+
+        /* backlight */
+        ctrl_outw((ctrl_inw(PORT_PSCR) & ~0x00C0) | 0x40, PORT_PSCR);
+        ctrl_outb(ctrl_inb(PORT_PSDR) & ~0x08, PORT_PSDR);
+        ctrl_outw(0x100, FPGA_BKLREG);
+}
+
+static struct sh_mobile_lcdc_info lcdc_info = {
+        .clock_source = LCDC_CLK_EXTERNAL,
+        .ch[0] = {
+                .chan = LCDC_CHAN_MAINLCD,
+                .bpp = 16,
+                .interface_type = RGB18,
+                .clock_divider = 1,
+                .lcd_cfg = {
+                        .name = "LB070WV1",
+                        .xres = 800,
+                        .yres = 480,
+                        .left_margin = 40,
+                        .right_margin = 160,
+                        .hsync_len = 8,
+                        .upper_margin = 63,
+                        .lower_margin = 80,
+                        .vsync_len = 1,
+                        .sync = 0, /* hsync and vsync are active low */
+                },
+                .board_cfg = {
+                        .display_on = ap320_wvga_power_on,
+                },
+        }
+};
+
+static struct resource lcdc_resources[] = {
+        [0] = {
+                .name   = "LCDC",
+                .start  = 0xfe940000, /* P4-only space */
+                .end    = 0xfe941fff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device lcdc_device = {
+        .name           = "sh_mobile_lcdc_fb",
+        .num_resources  = ARRAY_SIZE(lcdc_resources),
+        .resource       = lcdc_resources,
+        .dev            = {
+                .platform_data  = &lcdc_info,
+        },
+};
+
+static unsigned char camera_ncm03j_magic[] =
+{
+        0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
+        0x1D, 0x00, 0x1E, 0x8A, 0x21, 0x00, 0x33, 0x36,
+        0x36, 0x60, 0x37, 0x08, 0x3B, 0x31, 0x44, 0x0F,
+        0x46, 0xF0, 0x4B, 0x28, 0x4C, 0x21, 0x4D, 0x55,
+        0x4E, 0x1B, 0x4F, 0xC7, 0x50, 0xFC, 0x51, 0x12,
+        0x58, 0x02, 0x66, 0xC0, 0x67, 0x46, 0x6B, 0xA0,
+        0x6C, 0x34, 0x7E, 0x25, 0x7F, 0x25, 0x8D, 0x0F,
+        0x92, 0x40, 0x93, 0x04, 0x94, 0x26, 0x95, 0x0A,
+        0x99, 0x03, 0x9A, 0xF0, 0x9B, 0x14, 0x9D, 0x7A,
+        0xC5, 0x02, 0xD6, 0x07, 0x59, 0x00, 0x5A, 0x1A,
+        0x5B, 0x2A, 0x5C, 0x37, 0x5D, 0x42, 0x5E, 0x56,
+        0xC8, 0x00, 0xC9, 0x1A, 0xCA, 0x2A, 0xCB, 0x37,
+        0xCC, 0x42, 0xCD, 0x56, 0xCE, 0x00, 0xCF, 0x1A,
+        0xD0, 0x2A, 0xD1, 0x37, 0xD2, 0x42, 0xD3, 0x56,
+        0x5F, 0x68, 0x60, 0x87, 0x61, 0xA3, 0x62, 0xBC,
+        0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
+};
+
+static int camera_set_capture(struct soc_camera_platform_info *info,
+                              int enable)
+{
+        struct i2c_adapter *a = i2c_get_adapter(0);
+        struct i2c_msg msg;
+        int ret = 0;
+        int i;
+
+        if (!enable)
+                return 0; /* no disable for now */
+
+        for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) {
+                u_int8_t buf[8];
+
+                msg.addr = 0x6e;
+                msg.buf = buf;
+                msg.len = 2;
+                msg.flags = 0;
+
+                buf[0] = camera_ncm03j_magic[i];
+                buf[1] = camera_ncm03j_magic[i + 1];
+
+                ret = (ret < 0) ? ret : i2c_transfer(a, &msg, 1);
+        }
+
+        return ret;
+}
+
+static struct soc_camera_platform_info camera_info = {
+        .iface = 0,
+        .format_name = "UYVY",
+        .format_depth = 16,
+        .format = {
+                .pixelformat = V4L2_PIX_FMT_UYVY,
+                .colorspace = V4L2_COLORSPACE_SMPTE170M,
+                .width = 640,
+                .height = 480,
+        },
+        .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
+        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+        .set_capture = camera_set_capture,
+};
+
+static struct platform_device camera_device = {
+        .name           = "soc_camera_platform",
+        .dev            = {
+                .platform_data  = &camera_info,
+        },
+};
+
+static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
+        .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
+        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+};
+
+static struct resource ceu_resources[] = {
+        [0] = {
+                .name   = "CEU",
+                .start  = 0xfe910000,
+                .end    = 0xfe91009f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 52,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device ceu_device = {
+        .name           = "sh_mobile_ceu",
+        .num_resources  = ARRAY_SIZE(ceu_resources),
+        .resource       = ceu_resources,
+        .dev            = {
+                .platform_data  = &sh_mobile_ceu_info,
+        },
+};
+
+static struct platform_device *ap325rxa_devices[] __initdata = {
+        &smc9118_device,
+        &ap325rxa_nor_flash_device,
+        &lcdc_device,
+        &ceu_device,
+        &camera_device,
+};
+
+static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
+};
+
+static int __init ap325rxa_devices_setup(void)
+{
+        clk_always_enable("mstp200"); /* LCDC */
+        clk_always_enable("mstp203"); /* CEU */
+
+        platform_resource_setup_memory(&ceu_device, "ceu", 4 << 20);
+
+        i2c_register_board_info(0, ap325rxa_i2c_devices,
+                                ARRAY_SIZE(ap325rxa_i2c_devices));
+ 
+        return platform_add_devices(ap325rxa_devices,
+                                ARRAY_SIZE(ap325rxa_devices));
+}
+device_initcall(ap325rxa_devices_setup);
+
+static void __init ap325rxa_setup(char **cmdline_p)
+{
+        /* LCDC configuration */
+        ctrl_outw(ctrl_inw(PORT_PHCR) & ~0xffff, PORT_PHCR);
+        ctrl_outw(ctrl_inw(PORT_PLCR) & ~0xffff, PORT_PLCR);
+        ctrl_outw(ctrl_inw(PORT_PMCR) & ~0xffff, PORT_PMCR);
+        ctrl_outw(ctrl_inw(PORT_PRCR) & ~0x03ff, PORT_PRCR);
+        ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x01C0, PORT_HIZCRA);
+
+        /* CEU */
+        ctrl_outw(ctrl_inw(PORT_MSELCRB) & ~0x0001, PORT_MSELCRB);
+        ctrl_outw(ctrl_inw(PORT_PSELD) & ~0x0003, PORT_PSELD);
+        ctrl_outw((ctrl_inw(PORT_PZCR) & ~0xff00) | 0x5500, PORT_PZCR);
+        ctrl_outb((ctrl_inb(PORT_PZDR) & ~0xf0) | 0x20, PORT_PZDR);
+}
+
+static struct sh_machine_vector mv_ap325rxa __initmv = {
+        .mv_name = "AP-325RXA",
+        .mv_setup = ap325rxa_setup,
+};
diff --git a/arch/sh/boards/renesas/migor/Kconfig b/arch/sh/boards/renesas/migor/Kconfig
new file mode 100644
index 000000000000..a7b3b728ec3c
--- /dev/null
+++ b/arch/sh/boards/renesas/migor/Kconfig
@@ -0,0 +1,15 @@
+if SH_MIGOR
+
+choice
+        prompt "Migo-R LCD Panel Board Selection"
+        default SH_MIGOR_QVGA
+
+config SH_MIGOR_QVGA
+        bool "QVGA (320x240)"
+
+config SH_MIGOR_RTA_WVGA
+        bool "RTA WVGA (800x480)"
+
+endchoice
+
+endif
diff --git a/arch/sh/boards/renesas/migor/Makefile b/arch/sh/boards/renesas/migor/Makefile
index 77037567633b..5f231dd25c0e 100644
--- a/arch/sh/boards/renesas/migor/Makefile
+++ b/arch/sh/boards/renesas/migor/Makefile
@@ -1 +1,2 @@
 obj-y    := setup.o
+obj-$(CONFIG_SH_MIGOR_QVGA)     +=  lcd_qvga.o
diff --git a/arch/sh/boards/renesas/migor/lcd_qvga.c b/arch/sh/boards/renesas/migor/lcd_qvga.c
new file mode 100644
index 000000000000..6e9609596448
--- /dev/null
+++ b/arch/sh/boards/renesas/migor/lcd_qvga.c
@@ -0,0 +1,165 @@
+/*
+ * Support for SuperH MigoR Quarter VGA LCD Panel
+ *
+ * Copyright (C) 2008 Magnus Damm
+ *
+ * Based on lcd_powertip.c from Kenati Technologies Pvt Ltd.
+ * Copyright (c) 2007 Ujjwal Pande <ujjwal@kenati.com>,
+ *
+ * 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.
+ */
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm/sh_mobile_lcdc.h>
+#include <asm/migor.h>
+
+/* LCD Module is a PH240320T according to board schematics. This module
+ * is made up of a 240x320 LCD hooked up to a R61505U (or HX8347-A01?)
+ * Driver IC. This IC is connected to the SH7722 built-in LCDC using a
+ * SYS-80 interface configured in 16 bit mode.
+ *
+ * Index 0: "Device Code Read" returns 0x1505.
+ */
+
+static void reset_lcd_module(void)
+{
+        ctrl_outb(ctrl_inb(PORT_PHDR) & ~0x04, PORT_PHDR);
+        mdelay(2);
+        ctrl_outb(ctrl_inb(PORT_PHDR) | 0x04, PORT_PHDR);
+        mdelay(1);
+}
+
+/* DB0-DB7 are connected to D1-D8, and DB8-DB15 to D10-D17 */
+
+static unsigned long adjust_reg18(unsigned short data)
+{
+        unsigned long tmp1, tmp2;
+
+        tmp1 = (data<<1 | 0x00000001) & 0x000001FF;
+        tmp2 = (data<<2 | 0x00000200) & 0x0003FE00;
+        return tmp1 | tmp2;
+}
+
+static void write_reg(void *sys_ops_handle,
+                       struct sh_mobile_lcdc_sys_bus_ops *sys_ops,
+                       unsigned short reg, unsigned short data)
+{
+        sys_ops->write_index(sys_ops_handle, adjust_reg18(reg << 8 | data));
+}
+
+static void write_reg16(void *sys_ops_handle,
+                        struct sh_mobile_lcdc_sys_bus_ops *sys_ops,
+                        unsigned short reg, unsigned short data)
+{
+        sys_ops->write_index(sys_ops_handle, adjust_reg18(reg));
+        sys_ops->write_data(sys_ops_handle, adjust_reg18(data));
+}
+
+static unsigned long read_reg16(void *sys_ops_handle,
+                                struct sh_mobile_lcdc_sys_bus_ops *sys_ops,
+                                unsigned short reg)
+{
+        unsigned long data;
+
+        sys_ops->write_index(sys_ops_handle, adjust_reg18(reg));
+        data = sys_ops->read_data(sys_ops_handle);
+        return ((data >> 1) & 0xff) | ((data >> 2) & 0xff00);
+}
+
+static void migor_lcd_qvga_seq(void *sys_ops_handle,
+                               struct sh_mobile_lcdc_sys_bus_ops *sys_ops,
+                               unsigned short const *data, int no_data)
+{
+        int i;
+
+        for (i = 0; i < no_data; i += 2)
+                write_reg16(sys_ops_handle, sys_ops, data[i], data[i + 1]);
+}
+
+static const unsigned short sync_data[] = {
+        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+};
+
+static const unsigned short magic0_data[] = {
+        0x0060, 0x2700, 0x0008, 0x0808, 0x0090, 0x001A, 0x0007, 0x0001,
+        0x0017, 0x0001, 0x0019, 0x0000, 0x0010, 0x17B0, 0x0011, 0x0116,
+        0x0012, 0x0198, 0x0013, 0x1400, 0x0029, 0x000C, 0x0012, 0x01B8,
+};
+
+static const unsigned short magic1_data[] = {
+        0x0030, 0x0307, 0x0031, 0x0303, 0x0032, 0x0603, 0x0033, 0x0202,
+        0x0034, 0x0202, 0x0035, 0x0202, 0x0036, 0x1F1F, 0x0037, 0x0303,
+        0x0038, 0x0303, 0x0039, 0x0603, 0x003A, 0x0202, 0x003B, 0x0102,
+        0x003C, 0x0204, 0x003D, 0x0000, 0x0001, 0x0100, 0x0002, 0x0300,
+        0x0003, 0x5028, 0x0020, 0x00ef, 0x0021, 0x0000, 0x0004, 0x0000,
+        0x0009, 0x0000, 0x000A, 0x0008, 0x000C, 0x0000, 0x000D, 0x0000,
+        0x0015, 0x8000,
+};
+
+static const unsigned short magic2_data[] = {
+        0x0061, 0x0001, 0x0092, 0x0100, 0x0093, 0x0001, 0x0007, 0x0021,
+};
+
+static const unsigned short magic3_data[] = {
+        0x0010, 0x16B0, 0x0011, 0x0111, 0x0007, 0x0061,
+};
+
+int migor_lcd_qvga_setup(void *board_data, void *sohandle,
+                         struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        unsigned long xres = 320;
+        unsigned long yres = 240;
+        int k;
+
+        reset_lcd_module();
+        migor_lcd_qvga_seq(sohandle, so, sync_data, ARRAY_SIZE(sync_data));
+
+        if (read_reg16(sohandle, so, 0) != 0x1505)
+                return -ENODEV;
+
+        pr_info("Migo-R QVGA LCD Module detected.\n");
+
+        migor_lcd_qvga_seq(sohandle, so, sync_data, ARRAY_SIZE(sync_data));
+        write_reg16(sohandle, so, 0x00A4, 0x0001);
+        mdelay(10);
+
+        migor_lcd_qvga_seq(sohandle, so, magic0_data, ARRAY_SIZE(magic0_data));
+        mdelay(100);
+
+        migor_lcd_qvga_seq(sohandle, so, magic1_data, ARRAY_SIZE(magic1_data));
+        write_reg16(sohandle, so, 0x0050, 0xef - (yres - 1));
+        write_reg16(sohandle, so, 0x0051, 0x00ef);
+        write_reg16(sohandle, so, 0x0052, 0x0000);
+        write_reg16(sohandle, so, 0x0053, xres - 1);
+
+        migor_lcd_qvga_seq(sohandle, so, magic2_data, ARRAY_SIZE(magic2_data));
+        mdelay(10);
+
+        migor_lcd_qvga_seq(sohandle, so, magic3_data, ARRAY_SIZE(magic3_data));
+        mdelay(40);
+
+        /* clear GRAM to avoid displaying garbage */
+
+        write_reg16(sohandle, so, 0x0020, 0x0000); /* horiz addr */
+        write_reg16(sohandle, so, 0x0021, 0x0000); /* vert addr */
+
+        for (k = 0; k < (xres * 256); k++) /* yes, 256 words per line */
+                write_reg16(sohandle, so, 0x0022, 0x0000);
+
+        write_reg16(sohandle, so, 0x0020, 0x0000); /* reset horiz addr */
+        write_reg16(sohandle, so, 0x0021, 0x0000); /* reset vert addr */
+        write_reg16(sohandle, so, 0x0007, 0x0173);
+        mdelay(40);
+
+        /* enable display */
+        write_reg(sohandle, so, 0x00, 0x22);
+        mdelay(100);
+        return 0;
+}
diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/renesas/migor/setup.c
index 963c99322095..7bd365ad2d06 100644
--- a/arch/sh/boards/renesas/migor/setup.c
+++ b/arch/sh/boards/renesas/migor/setup.c
@@ -15,9 +15,15 @@
 #include <linux/mtd/nand.h>
 #include <linux/i2c.h>
 #include <linux/smc91x.h>
+#include <linux/delay.h>
+#include <linux/clk.h>
+#include <media/soc_camera_platform.h>
+#include <media/sh_mobile_ceu.h>
+#include <asm/clock.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
 #include <asm/sh_keysc.h>
+#include <asm/sh_mobile_lcdc.h>
 #include <asm/migor.h>
 
 /* Address     IRQ  Size  Bus  Description
@@ -198,14 +204,237 @@ static struct platform_device migor_nand_flash_device = {
         }
 };
 
+static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
+#ifdef CONFIG_SH_MIGOR_RTA_WVGA
+        .clock_source = LCDC_CLK_BUS,
+        .ch[0] = {
+                .chan = LCDC_CHAN_MAINLCD,
+                .bpp = 16,
+                .interface_type = RGB16,
+                .clock_divider = 2,
+                .lcd_cfg = {
+                        .name = "LB070WV1",
+                        .xres = 800,
+                        .yres = 480,
+                        .left_margin = 64,
+                        .right_margin = 16,
+                        .hsync_len = 120,
+                        .upper_margin = 1,
+                        .lower_margin = 17,
+                        .vsync_len = 2,
+                        .sync = 0,
+                },
+        }
+#endif
+#ifdef CONFIG_SH_MIGOR_QVGA
+        .clock_source = LCDC_CLK_PERIPHERAL,
+        .ch[0] = {
+                .chan = LCDC_CHAN_MAINLCD,
+                .bpp = 16,
+                .interface_type = SYS16A,
+                .clock_divider = 10,
+                .lcd_cfg = {
+                        .name = "PH240320T",
+                        .xres = 320,
+                        .yres = 240,
+                        .left_margin = 0,
+                        .right_margin = 16,
+                        .hsync_len = 8,
+                        .upper_margin = 1,
+                        .lower_margin = 17,
+                        .vsync_len = 2,
+                        .sync = FB_SYNC_HOR_HIGH_ACT,
+                },
+                .board_cfg = {
+                        .setup_sys = migor_lcd_qvga_setup,
+                },
+                .sys_bus_cfg = {
+                        .ldmt2r = 0x06000a09,
+                        .ldmt3r = 0x180e3418,
+                },
+        }
+#endif
+};
+
+static struct resource migor_lcdc_resources[] = {
+        [0] = {
+                .name   = "LCDC",
+                .start  = 0xfe940000, /* P4-only space */
+                .end    = 0xfe941fff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device migor_lcdc_device = {
+        .name           = "sh_mobile_lcdc_fb",
+        .num_resources  = ARRAY_SIZE(migor_lcdc_resources),
+        .resource       = migor_lcdc_resources,
+        .dev    = {
+                .platform_data  = &sh_mobile_lcdc_info,
+        },
+};
+
+static struct clk *camera_clk;
+
+static void camera_power_on(void)
+{
+        unsigned char value;
+
+        camera_clk = clk_get(NULL, "video_clk");
+        clk_set_rate(camera_clk, 24000000);
+        clk_enable(camera_clk); /* start VIO_CKO */
+
+        mdelay(10);
+        value = ctrl_inb(PORT_PTDR);
+        value &= ~0x09;
+#ifndef CONFIG_SH_MIGOR_RTA_WVGA
+        value |= 0x01;
+#endif
+        ctrl_outb(value, PORT_PTDR);
+        mdelay(10);
+
+        ctrl_outb(value | 8, PORT_PTDR);
+}
+
+static void camera_power_off(void)
+{
+        clk_disable(camera_clk); /* stop VIO_CKO */
+        clk_put(camera_clk);
+
+        ctrl_outb(ctrl_inb(PORT_PTDR) & ~0x08, PORT_PTDR);
+}
+
+static unsigned char camera_ov772x_magic[] =
+{
+        0x09, 0x01, 0x0c, 0x10, 0x0d, 0x41, 0x0e, 0x01,
+        0x12, 0x00, 0x13, 0x8F, 0x14, 0x4A, 0x15, 0x00,
+        0x16, 0x00, 0x17, 0x23, 0x18, 0xa0, 0x19, 0x07,
+        0x1a, 0xf0, 0x1b, 0x40, 0x1f, 0x00, 0x20, 0x10,
+        0x22, 0xff, 0x23, 0x01, 0x28, 0x00, 0x29, 0xa0,
+        0x2a, 0x00, 0x2b, 0x00, 0x2c, 0xf0, 0x2d, 0x00,
+        0x2e, 0x00, 0x30, 0x80, 0x31, 0x60, 0x32, 0x00,
+        0x33, 0x00, 0x34, 0x00, 0x3d, 0x80, 0x3e, 0xe2,
+        0x3f, 0x1f, 0x42, 0x80, 0x43, 0x80, 0x44, 0x80,
+        0x45, 0x80, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00,
+        0x49, 0x50, 0x4a, 0x30, 0x4b, 0x50, 0x4c, 0x50,
+        0x4d, 0x00, 0x4e, 0xef, 0x4f, 0x10, 0x50, 0x60,
+        0x51, 0x00, 0x52, 0x00, 0x53, 0x24, 0x54, 0x7a,
+        0x55, 0xfc, 0x62, 0xff, 0x63, 0xf0, 0x64, 0x1f,
+        0x65, 0x00, 0x66, 0x10, 0x67, 0x00, 0x68, 0x00,
+        0x69, 0x5c, 0x6a, 0x11, 0x6b, 0xa2, 0x6c, 0x01,
+        0x6d, 0x50, 0x6e, 0x80, 0x6f, 0x80, 0x70, 0x0f,
+        0x71, 0x00, 0x72, 0x00, 0x73, 0x0f, 0x74, 0x0f,
+        0x75, 0xff, 0x78, 0x10, 0x79, 0x70, 0x7a, 0x70,
+        0x7b, 0xf0, 0x7c, 0xf0, 0x7d, 0xf0, 0x7e, 0x0e,
+        0x7f, 0x1a, 0x80, 0x31, 0x81, 0x5a, 0x82, 0x69,
+        0x83, 0x75, 0x84, 0x7e, 0x85, 0x88, 0x86, 0x8f,
+        0x87, 0x96, 0x88, 0xa3, 0x89, 0xaf, 0x8a, 0xc4,
+        0x8b, 0xd7, 0x8c, 0xe8, 0x8d, 0x20, 0x8e, 0x00,
+        0x8f, 0x00, 0x90, 0x08, 0x91, 0x10, 0x92, 0x1f,
+        0x93, 0x01, 0x94, 0x2c, 0x95, 0x24, 0x96, 0x08,
+        0x97, 0x14, 0x98, 0x24, 0x99, 0x38, 0x9a, 0x9e,
+        0x9b, 0x00, 0x9c, 0x40, 0x9e, 0x11, 0x9f, 0x02,
+        0xa0, 0x00, 0xa1, 0x40, 0xa2, 0x40, 0xa3, 0x06,
+        0xa4, 0x00, 0xa6, 0x00, 0xa7, 0x40, 0xa8, 0x40,
+        0xa9, 0x80, 0xaa, 0x80, 0xab, 0x06, 0xac, 0xff,
+        0x12, 0x06, 0x64, 0x3f, 0x12, 0x46, 0x17, 0x3f,
+        0x18, 0x50, 0x19, 0x03, 0x1a, 0x78, 0x29, 0x50,
+        0x2c, 0x78,
+};
+
+static int ov772x_set_capture(struct soc_camera_platform_info *info,
+                              int enable)
+{
+        struct i2c_adapter *a = i2c_get_adapter(0);
+        struct i2c_msg msg;
+        int ret = 0;
+        int i;
+
+        if (!enable)
+                return 0; /* camera_power_off() is enough */
+
+        for (i = 0; i < ARRAY_SIZE(camera_ov772x_magic); i += 2) {
+                u_int8_t buf[8];
+
+                msg.addr = 0x21;
+                msg.buf = buf;
+                msg.len = 2;
+                msg.flags = 0;
+
+                buf[0] = camera_ov772x_magic[i];
+                buf[1] = camera_ov772x_magic[i + 1];
+
+                ret = (ret < 0) ? ret : i2c_transfer(a, &msg, 1);
+        }
+
+        return ret;
+}
+
+static struct soc_camera_platform_info ov772x_info = {
+        .iface = 0,
+        .format_name = "RGB565",
+        .format_depth = 16,
+        .format = {
+                .pixelformat = V4L2_PIX_FMT_RGB565,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .width = 320,
+                .height = 240,
+        },
+        .bus_param =  SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
+        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+        .set_capture = ov772x_set_capture,
+};
+
+static struct platform_device migor_camera_device = {
+        .name           = "soc_camera_platform",
+        .dev    = {
+                .platform_data  = &ov772x_info,
+        },
+};
+
+static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
+        .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \
+        | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH,
+        .enable_camera = camera_power_on,
+        .disable_camera = camera_power_off,
+};
+
+static struct resource migor_ceu_resources[] = {
+        [0] = {
+                .name   = "CEU",
+                .start  = 0xfe910000,
+                .end    = 0xfe91009f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 52,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device migor_ceu_device = {
+        .name           = "sh_mobile_ceu",
+        .num_resources  = ARRAY_SIZE(migor_ceu_resources),
+        .resource       = migor_ceu_resources,
+        .dev    = {
+                .platform_data  = &sh_mobile_ceu_info,
+        },
+};
+
 static struct platform_device *migor_devices[] __initdata = {
         &smc91x_eth_device,
         &sh_keysc_device,
+        &migor_lcdc_device,
+        &migor_ceu_device,
+        &migor_camera_device,
         &migor_nor_flash_device,
         &migor_nand_flash_device,
 };
 
-static struct i2c_board_info __initdata migor_i2c_devices[] = {
+static struct i2c_board_info migor_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("rs5c372b", 0x32),
         },
@@ -217,6 +446,12 @@ static struct i2c_board_info __initdata migor_i2c_devices[] = {
 
 static int __init migor_devices_setup(void)
 {
+        clk_always_enable("mstp214"); /* KEYSC */
+        clk_always_enable("mstp200"); /* LCDC */
+        clk_always_enable("mstp203"); /* CEU */
+
+        platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20);
+
         i2c_register_board_info(0, migor_i2c_devices,
                                 ARRAY_SIZE(migor_i2c_devices));
  
@@ -235,20 +470,51 @@ static void __init migor_setup(char **cmdline_p)
         ctrl_outw(ctrl_inw(PORT_PSELA) & ~0x4100, PORT_PSELA);
         ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x4000, PORT_HIZCRA);
         ctrl_outw(ctrl_inw(PORT_HIZCRC) & ~0xc000, PORT_HIZCRC);
-        ctrl_outl(ctrl_inl(MSTPCR2) & ~0x00004000, MSTPCR2);
 
         /* NAND Flash */
         ctrl_outw(ctrl_inw(PORT_PXCR) & 0x0fff, PORT_PXCR);
         ctrl_outl((ctrl_inl(BSC_CS6ABCR) & ~0x00000600) | 0x00000200,
                   BSC_CS6ABCR);
 
-        /* I2C */
-        ctrl_outl(ctrl_inl(MSTPCR1) & ~0x00000200, MSTPCR1);
-
         /* Touch Panel - Enable IRQ6 */
         ctrl_outw(ctrl_inw(PORT_PZCR) & ~0xc, PORT_PZCR);
         ctrl_outw((ctrl_inw(PORT_PSELA) | 0x8000), PORT_PSELA);
         ctrl_outw((ctrl_inw(PORT_HIZCRC) & ~0x4000), PORT_HIZCRC);
+
+#ifdef CONFIG_SH_MIGOR_RTA_WVGA
+        /* LCDC - WVGA - Enable RGB Interface signals */
+        ctrl_outw(ctrl_inw(PORT_PACR) & ~0x0003, PORT_PACR);
+        ctrl_outw(0x0000, PORT_PHCR);
+        ctrl_outw(0x0000, PORT_PLCR);
+        ctrl_outw(0x0000, PORT_PMCR);
+        ctrl_outw(ctrl_inw(PORT_PRCR) & ~0x000f, PORT_PRCR);
+        ctrl_outw((ctrl_inw(PORT_PSELD) & ~0x000d) | 0x0400, PORT_PSELD);
+        ctrl_outw(ctrl_inw(PORT_MSELCRB) & ~0x0100, PORT_MSELCRB);
+        ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x01e0, PORT_HIZCRA);
+#endif
+#ifdef CONFIG_SH_MIGOR_QVGA
+        /* LCDC - QVGA - Enable SYS Interface signals */
+        ctrl_outw(ctrl_inw(PORT_PACR) & ~0x0003, PORT_PACR);
+        ctrl_outw((ctrl_inw(PORT_PHCR) & ~0xcfff) | 0x0010, PORT_PHCR);
+        ctrl_outw(0x0000, PORT_PLCR);
+        ctrl_outw(0x0000, PORT_PMCR);
+        ctrl_outw(ctrl_inw(PORT_PRCR) & ~0x030f, PORT_PRCR);
+        ctrl_outw((ctrl_inw(PORT_PSELD) & ~0x0001) | 0x0420, PORT_PSELD);
+        ctrl_outw(ctrl_inw(PORT_MSELCRB) | 0x0100, PORT_MSELCRB);
+        ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x01e0, PORT_HIZCRA);
+#endif
+
+        /* CEU */
+        ctrl_outw((ctrl_inw(PORT_PTCR) & ~0x03c3) | 0x0051, PORT_PTCR);
+        ctrl_outw(ctrl_inw(PORT_PUCR) & ~0x03ff, PORT_PUCR);
+        ctrl_outw(ctrl_inw(PORT_PVCR) & ~0x03ff, PORT_PVCR);
+        ctrl_outw(ctrl_inw(PORT_PWCR) & ~0x3c00, PORT_PWCR);
+        ctrl_outw(ctrl_inw(PORT_PSELC) | 0x0001, PORT_PSELC);
+        ctrl_outw(ctrl_inw(PORT_PSELD) & ~0x2000, PORT_PSELD);
+        ctrl_outw(ctrl_inw(PORT_PSELE) | 0x000f, PORT_PSELE);
+        ctrl_outw(ctrl_inw(PORT_MSELCRB) | 0x2200, PORT_MSELCRB);
+        ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x0a00, PORT_HIZCRA);
+        ctrl_outw(ctrl_inw(PORT_HIZCRB) & ~0x0003, PORT_HIZCRB);
 }
 
 static struct sh_machine_vector mv_migor __initmv = {
diff --git a/arch/sh/boards/renesas/rsk7203/Makefile b/arch/sh/boards/renesas/rsk7203/Makefile
new file mode 100644
index 000000000000..f663768429f0
--- /dev/null
+++ b/arch/sh/boards/renesas/rsk7203/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o
diff --git a/arch/sh/boards/renesas/rsk7203/setup.c b/arch/sh/boards/renesas/rsk7203/setup.c
new file mode 100644
index 000000000000..0bbda04b03b9
--- /dev/null
+++ b/arch/sh/boards/renesas/rsk7203/setup.c
@@ -0,0 +1,126 @@
+/*
+ * Renesas Technology Europe RSK+ 7203 Support.
+ *
+ * Copyright (C) 2008 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/map.h>
+#include <asm/machvec.h>
+#include <asm/io.h>
+
+static struct resource smc911x_resources[] = {
+        [0] = {
+                .start          = 0x24000000,
+                .end            = 0x24000000 + 0x100,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = 64,
+                .end            = 64,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc911x_device = {
+        .name           = "smc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc911x_resources),
+        .resource       = smc911x_resources,
+};
+
+static const char *probes[] = { "cmdlinepart", NULL };
+
+static struct mtd_partition *parsed_partitions;
+
+static struct mtd_partition rsk7203_partitions[] = {
+        {
+                .name           = "Bootloader",
+                .offset         = 0x00000000,
+                .size           = 0x00040000,
+                .mask_flags     = MTD_WRITEABLE,
+        }, {
+                .name           = "Kernel",
+                .offset         = MTDPART_OFS_NXTBLK,
+                .size           = 0x001c0000,
+        }, {
+                .name           = "Flash_FS",
+                .offset         = MTDPART_OFS_NXTBLK,
+                .size           = MTDPART_SIZ_FULL,
+        }
+};
+
+static struct physmap_flash_data flash_data = {
+        .width          = 2,
+};
+
+static struct resource flash_resource = {
+        .start          = 0x20000000,
+        .end            = 0x20400000,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device flash_device = {
+        .name           = "physmap-flash",
+        .id             = -1,
+        .resource       = &flash_resource,
+        .num_resources  = 1,
+        .dev            = {
+                .platform_data = &flash_data,
+        },
+};
+
+static struct mtd_info *flash_mtd;
+
+static struct map_info rsk7203_flash_map = {
+        .name           = "RSK+ Flash",
+        .size           = 0x400000,
+        .bankwidth      = 2,
+};
+
+static void __init set_mtd_partitions(void)
+{
+        int nr_parts = 0;
+
+        simple_map_init(&rsk7203_flash_map);
+        flash_mtd = do_map_probe("cfi_probe", &rsk7203_flash_map);
+        nr_parts = parse_mtd_partitions(flash_mtd, probes,
+                                        &parsed_partitions, 0);
+        /* If there is no partition table, used the hard coded table */
+        if (nr_parts <= 0) {
+                flash_data.parts = rsk7203_partitions;
+                flash_data.nr_parts = ARRAY_SIZE(rsk7203_partitions);
+        } else {
+                flash_data.nr_parts = nr_parts;
+                flash_data.parts = parsed_partitions;
+        }
+}
+
+
+static struct platform_device *rsk7203_devices[] __initdata = {
+        &smc911x_device,
+        &flash_device,
+};
+
+static int __init rsk7203_devices_setup(void)
+{
+        set_mtd_partitions();
+        return platform_add_devices(rsk7203_devices,
+                                    ARRAY_SIZE(rsk7203_devices));
+}
+device_initcall(rsk7203_devices_setup);
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_rsk7203 __initmv = {
+        .mv_name        = "RSK+7203",
+};
diff --git a/arch/sh/boards/renesas/sh7763rdp/Makefile b/arch/sh/boards/renesas/sh7763rdp/Makefile
new file mode 100644
index 000000000000..f6c0b55516d2
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7763rdp/Makefile
@@ -0,0 +1 @@
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/renesas/sh7763rdp/irq.c b/arch/sh/boards/renesas/sh7763rdp/irq.c
new file mode 100644
index 000000000000..fd850bad2dec
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7763rdp/irq.c
@@ -0,0 +1,45 @@
+/*
+ * linux/arch/sh/boards/renesas/sh7763rdp/irq.c
+ *
+ * Renesas Solutions SH7763RDP Support.
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Copyright (C) 2008  Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/sh7763rdp.h>
+
+#define INTC_BASE               (0xFFD00000)
+#define INTC_INT2PRI7   (INTC_BASE+0x4001C)
+#define INTC_INT2MSKCR  (INTC_BASE+0x4003C)
+#define INTC_INT2MSKCR1 (INTC_BASE+0x400D4)
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_sh7763rdp_IRQ(void)
+{
+        /* GPIO enabled */
+        ctrl_outl(1 << 25, INTC_INT2MSKCR);
+
+        /* enable GPIO interrupts */
+        ctrl_outl((ctrl_inl(INTC_INT2PRI7) & 0xFF00FFFF) | 0x000F0000,
+                  INTC_INT2PRI7);
+
+        /* USBH enabled */
+        ctrl_outl(1 << 17, INTC_INT2MSKCR1);
+
+        /* GETHER enabled */
+        ctrl_outl(1 << 16, INTC_INT2MSKCR1);
+
+        /* DMAC enabled */
+        ctrl_outl(1 << 8, INTC_INT2MSKCR);
+}
diff --git a/arch/sh/boards/renesas/sh7763rdp/setup.c b/arch/sh/boards/renesas/sh7763rdp/setup.c
new file mode 100644
index 000000000000..925f16af7121
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7763rdp/setup.c
@@ -0,0 +1,128 @@
+/*
+ * linux/arch/sh/boards/renesas/sh7763rdp/setup.c
+ *
+ * Renesas Solutions sh7763rdp board
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/mtd/physmap.h>
+#include <asm/io.h>
+#include <asm/sh7763rdp.h>
+
+/* NOR Flash */
+static struct mtd_partition sh7763rdp_nor_flash_partitions[] = {
+        {
+                .name = "U-Boot",
+                .offset = 0,
+                .size = (2 * 128 * 1024),
+                .mask_flags = MTD_WRITEABLE,    /* Read-only */
+        }, {
+                .name = "Linux-Kernel",
+                .offset = MTDPART_OFS_APPEND,
+                .size = (20 * 128 * 1024),
+        }, {
+                .name = "Root Filesystem",
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct physmap_flash_data sh7763rdp_nor_flash_data = {
+        .width = 2,
+        .parts = sh7763rdp_nor_flash_partitions,
+        .nr_parts = ARRAY_SIZE(sh7763rdp_nor_flash_partitions),
+};
+
+static struct resource sh7763rdp_nor_flash_resources[] = {
+        [0] = {
+                .name = "NOR Flash",
+                .start = 0,
+                .end = (64 * 1024 * 1024),
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device sh7763rdp_nor_flash_device = {
+        .name = "physmap-flash",
+        .resource = sh7763rdp_nor_flash_resources,
+        .num_resources = ARRAY_SIZE(sh7763rdp_nor_flash_resources),
+        .dev = {
+                .platform_data = &sh7763rdp_nor_flash_data,
+        },
+};
+
+static struct platform_device *sh7763rdp_devices[] __initdata = {
+        &sh7763rdp_nor_flash_device,
+};
+
+static int __init sh7763rdp_devices_setup(void)
+{
+        return platform_add_devices(sh7763rdp_devices,
+                                    ARRAY_SIZE(sh7763rdp_devices));
+}
+__initcall(sh7763rdp_devices_setup);
+
+static void __init sh7763rdp_setup(char **cmdline_p)
+{
+        /* Board version check */
+        if (ctrl_inw(CPLD_BOARD_ID_ERV_REG) == 0xECB1)
+                printk(KERN_INFO "RTE Standard Configuration\n");
+        else
+                printk(KERN_INFO "RTA Standard Configuration\n");
+
+        /* USB pin select bits (clear bit 5-2 to 0) */
+        ctrl_outw((ctrl_inw(PORT_PSEL2) & 0xFFC3), PORT_PSEL2);
+        /* USBH setup port I controls to other (clear bits 4-9 to 0) */
+        ctrl_outw(ctrl_inw(PORT_PICR) & 0xFC0F, PORT_PICR);
+
+        /* Select USB Host controller */
+        ctrl_outw(0x00, USB_USBHSC);
+
+        /* For LCD */
+        /* set PTJ7-1, bits 15-2 of PJCR to 0 */
+        ctrl_outw(ctrl_inw(PORT_PJCR) & 0x0003, PORT_PJCR);
+        /* set PTI5, bits 11-10 of PICR to 0 */
+        ctrl_outw(ctrl_inw(PORT_PICR) & 0xF3FF, PORT_PICR);
+        ctrl_outw(0, PORT_PKCR);
+        ctrl_outw(0, PORT_PLCR);
+        /* set PSEL2 bits 14-8, 5-4, of PSEL2 to 0 */
+        ctrl_outw((ctrl_inw(PORT_PSEL2) & 0x00C0), PORT_PSEL2);
+        /* set PSEL3 bits 14-12, 6-4, 2-0 of PSEL3 to 0 */
+        ctrl_outw((ctrl_inw(PORT_PSEL3) & 0x0700), PORT_PSEL3);
+
+        /* For HAC */
+        /* bit3-0  0100:HAC & SSI1 enable */
+        ctrl_outw((ctrl_inw(PORT_PSEL1) & 0xFFF0) | 0x0004, PORT_PSEL1);
+        /* bit14      1:SSI_HAC_CLK enable */
+        ctrl_outw(ctrl_inw(PORT_PSEL4) | 0x4000, PORT_PSEL4);
+
+        /* SH-Ether */
+        ctrl_outw((ctrl_inw(PORT_PSEL1) & ~0xff00) | 0x2400, PORT_PSEL1);
+        ctrl_outw(0x0, PORT_PFCR);
+        ctrl_outw(0x0, PORT_PFCR);
+        ctrl_outw(0x0, PORT_PFCR);
+
+        /* MMC */
+        /*selects SCIF and MMC other functions */
+        ctrl_outw(0x0001, PORT_PSEL0);
+        /* MMC clock operates */
+        ctrl_outl(ctrl_inl(MSTPCR1) & ~0x8, MSTPCR1);
+        ctrl_outw(ctrl_inw(PORT_PACR) & ~0x3000, PORT_PACR);
+        ctrl_outw(ctrl_inw(PORT_PCCR) & ~0xCFC3, PORT_PCCR);
+}
+
+static struct sh_machine_vector mv_sh7763rdp __initmv = {
+        .mv_name = "sh7763drp",
+        .mv_setup = sh7763rdp_setup,
+        .mv_nr_irqs = 112,
+        .mv_init_irq = init_sh7763rdp_IRQ,
+};
diff --git a/arch/sh/boards/renesas/sh7785lcr/Makefile b/arch/sh/boards/renesas/sh7785lcr/Makefile
new file mode 100644
index 000000000000..77037567633b
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7785lcr/Makefile
@@ -0,0 +1 @@
+obj-y    := setup.o
diff --git a/arch/sh/boards/renesas/sh7785lcr/setup.c b/arch/sh/boards/renesas/sh7785lcr/setup.c
new file mode 100644
index 000000000000..b95d674ee704
--- /dev/null
+++ b/arch/sh/boards/renesas/sh7785lcr/setup.c
@@ -0,0 +1,302 @@
+/*
+ * Renesas Technology Corp. R0P7785LC0011RL Support.
+ *
+ * Copyright (C) 2008  Yoshihiro Shimoda
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/sm501.h>
+#include <linux/sm501-regs.h>
+#include <linux/fb.h>
+#include <linux/mtd/physmap.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-pca-platform.h>
+#include <linux/i2c-algo-pca.h>
+#include <asm/heartbeat.h>
+#include <asm/sh7785lcr.h>
+
+/*
+ * NOTE: This board has 2 physical memory maps.
+ *       Please look at include/asm-sh/sh7785lcr.h or hardware manual.
+ */
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = PLD_LEDCR,
+                .end    = PLD_LEDCR,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct heartbeat_data heartbeat_data = {
+        .regsize = 8,
+};
+
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .dev    = {
+                .platform_data  = &heartbeat_data,
+        },
+        .num_resources  = ARRAY_SIZE(heartbeat_resources),
+        .resource       = heartbeat_resources,
+};
+
+static struct mtd_partition nor_flash_partitions[] = {
+        {
+                .name           = "loader",
+                .offset         = 0x00000000,
+                .size           = 512 * 1024,
+        },
+        {
+                .name           = "bootenv",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 512 * 1024,
+        },
+        {
+                .name           = "kernel",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 4 * 1024 * 1024,
+        },
+        {
+                .name           = "data",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct physmap_flash_data nor_flash_data = {
+        .width          = 4,
+        .parts          = nor_flash_partitions,
+        .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
+};
+
+static struct resource nor_flash_resources[] = {
+        [0]     = {
+                .start  = NOR_FLASH_ADDR,
+                .end    = NOR_FLASH_ADDR + NOR_FLASH_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device nor_flash_device = {
+        .name           = "physmap-flash",
+        .dev            = {
+                .platform_data  = &nor_flash_data,
+        },
+        .num_resources  = ARRAY_SIZE(nor_flash_resources),
+        .resource       = nor_flash_resources,
+};
+
+static struct resource r8a66597_usb_host_resources[] = {
+        [0] = {
+                .name   = "r8a66597_hcd",
+                .start  = R8A66597_ADDR,
+                .end    = R8A66597_ADDR + R8A66597_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "r8a66597_hcd",
+                .start  = 2,
+                .end    = 2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device r8a66597_usb_host_device = {
+        .name           = "r8a66597_hcd",
+        .id             = -1,
+        .dev = {
+                .dma_mask               = NULL,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(r8a66597_usb_host_resources),
+        .resource       = r8a66597_usb_host_resources,
+};
+
+static struct resource sm501_resources[] = {
+        [0]     = {
+                .start  = SM107_MEM_ADDR,
+                .end    = SM107_MEM_ADDR + SM107_MEM_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1]     = {
+                .start  = SM107_REG_ADDR,
+                .end    = SM107_REG_ADDR + SM107_REG_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2]     = {
+                .start  = 10,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct fb_videomode sm501_default_mode_crt = {
+        .pixclock       = 35714,        /* 28MHz */
+        .xres           = 640,
+        .yres           = 480,
+        .left_margin    = 105,
+        .right_margin   = 16,
+        .upper_margin   = 33,
+        .lower_margin   = 10,
+        .hsync_len      = 39,
+        .vsync_len      = 2,
+        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct fb_videomode sm501_default_mode_pnl = {
+        .pixclock       = 40000,        /* 25MHz */
+        .xres           = 640,
+        .yres           = 480,
+        .left_margin    = 2,
+        .right_margin   = 16,
+        .upper_margin   = 33,
+        .lower_margin   = 10,
+        .hsync_len      = 39,
+        .vsync_len      = 2,
+        .sync           = 0,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_pnl = {
+        .def_bpp        = 16,
+        .def_mode       = &sm501_default_mode_pnl,
+        .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                          SM501FB_FLAG_USE_HWCURSOR |
+                          SM501FB_FLAG_USE_HWACCEL |
+                          SM501FB_FLAG_DISABLE_AT_EXIT |
+                          SM501FB_FLAG_PANEL_NO_VBIASEN,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_crt = {
+        .def_bpp        = 16,
+        .def_mode       = &sm501_default_mode_crt,
+        .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                          SM501FB_FLAG_USE_HWCURSOR |
+                          SM501FB_FLAG_USE_HWACCEL |
+                          SM501FB_FLAG_DISABLE_AT_EXIT,
+};
+
+static struct sm501_platdata_fb sm501_fb_pdata = {
+        .fb_route       = SM501_FB_OWN,
+        .fb_crt         = &sm501_pdata_fbsub_crt,
+        .fb_pnl         = &sm501_pdata_fbsub_pnl,
+};
+
+static struct sm501_initdata sm501_initdata = {
+        .gpio_high      = {
+                .set    = 0x00001fe0,
+                .mask   = 0x0,
+        },
+        .devices        = 0,
+        .mclk           = 84 * 1000000,
+        .m1xclk         = 112 * 1000000,
+};
+
+static struct sm501_platdata sm501_platform_data = {
+        .init           = &sm501_initdata,
+        .fb             = &sm501_fb_pdata,
+};
+
+static struct platform_device sm501_device = {
+        .name           = "sm501",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &sm501_platform_data,
+        },
+        .num_resources  = ARRAY_SIZE(sm501_resources),
+        .resource       = sm501_resources,
+};
+
+static struct resource i2c_resources[] = {
+        [0] = {
+                .start  = PCA9564_ADDR,
+                .end    = PCA9564_ADDR + PCA9564_SIZE - 1,
+                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
+        },
+        [1] = {
+                .start  = 12,
+                .end    = 12,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct i2c_pca9564_pf_platform_data i2c_platform_data = {
+        .gpio                   = 0,
+        .i2c_clock_speed        = I2C_PCA_CON_330kHz,
+        .timeout                = 100,
+};
+
+static struct platform_device i2c_device = {
+        .name           = "i2c-pca-platform",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &i2c_platform_data,
+        },
+        .num_resources  = ARRAY_SIZE(i2c_resources),
+        .resource       = i2c_resources,
+};
+
+static struct platform_device *sh7785lcr_devices[] __initdata = {
+        &heartbeat_device,
+        &nor_flash_device,
+        &r8a66597_usb_host_device,
+        &sm501_device,
+        &i2c_device,
+};
+
+static struct i2c_board_info __initdata sh7785lcr_i2c_devices[] = {
+        {
+                I2C_BOARD_INFO("r2025sd", 0x32),
+        },
+};
+
+static int __init sh7785lcr_devices_setup(void)
+{
+        i2c_register_board_info(0, sh7785lcr_i2c_devices,
+                                ARRAY_SIZE(sh7785lcr_i2c_devices));
+
+        return platform_add_devices(sh7785lcr_devices,
+                                    ARRAY_SIZE(sh7785lcr_devices));
+}
+__initcall(sh7785lcr_devices_setup);
+
+/* Initialize IRQ setting */
+void __init init_sh7785lcr_IRQ(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ7654);
+        plat_irq_setup_pins(IRQ_MODE_IRQ3210);
+}
+
+static void sh7785lcr_power_off(void)
+{
+        ctrl_outb(0x01, P2SEGADDR(PLD_POFCR));
+}
+
+/* Initialize the board */
+static void __init sh7785lcr_setup(char **cmdline_p)
+{
+        void __iomem *sm501_reg;
+
+        printk(KERN_INFO "Renesas Technology Corp. R0P7785LC0011RL support.\n");
+
+        pm_power_off = sh7785lcr_power_off;
+
+        /* sm501 DRAM configuration */
+        sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
+        writel(0x000307c2, sm501_reg);
+}
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_sh7785lcr __initmv = {
+        .mv_name                = "SH7785LCR",
+        .mv_setup               = sh7785lcr_setup,
+        .mv_init_irq            = init_sh7785lcr_IRQ,
+};
+
diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c
index 763f6deba814..1112e86aa93a 100644
--- a/arch/sh/boards/se/7343/irq.c
+++ b/arch/sh/boards/se/7343/irq.c
@@ -1,202 +1,80 @@
 /*
- * arch/sh/boards/se/7343/irq.c
+ * linux/arch/sh/boards/se/7343/irq.c
  *
+ * Copyright (C) 2008  Yoshihiro Shimoda
+ *
+ * Based on linux/arch/sh/boards/se/7722/irq.c
+ * Copyright (C) 2007  Nobuhiro Iwamatsu
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/mach/se7343.h>
+#include <asm/se7343.h>
 
-static void
-disable_intreq_irq(unsigned int irq)
+static void disable_se7343_irq(unsigned int irq)
 {
-        int bit = irq - OFFCHIP_IRQ_BASE;
-        u16 val;
-
-        val = ctrl_inw(PA_CPLD_IMSK);
-        val |= 1 << bit;
-        ctrl_outw(val, PA_CPLD_IMSK);
+        unsigned int bit = irq - SE7343_FPGA_IRQ_BASE;
+        ctrl_outw(ctrl_inw(PA_CPLD_IMSK) | 1 << bit, PA_CPLD_IMSK);
 }
 
-static void
-enable_intreq_irq(unsigned int irq)
+static void enable_se7343_irq(unsigned int irq)
 {
-        int bit = irq - OFFCHIP_IRQ_BASE;
-        u16 val;
-
-        val = ctrl_inw(PA_CPLD_IMSK);
-        val &= ~(1 << bit);
-        ctrl_outw(val, PA_CPLD_IMSK);
+        unsigned int bit = irq - SE7343_FPGA_IRQ_BASE;
+        ctrl_outw(ctrl_inw(PA_CPLD_IMSK) & ~(1 << bit), PA_CPLD_IMSK);
 }
 
-static void
-mask_and_ack_intreq_irq(unsigned int irq)
-{
-        disable_intreq_irq(irq);
-}
-
-static unsigned int
-startup_intreq_irq(unsigned int irq)
-{
-        enable_intreq_irq(irq);
-        return 0;
-}
-
-static void
-shutdown_intreq_irq(unsigned int irq)
-{
-        disable_intreq_irq(irq);
-}
-
-static void
-end_intreq_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                enable_intreq_irq(irq);
-}
-
-static struct hw_interrupt_type intreq_irq_type = {
-        .typename = "FPGA-IRQ",
-        .startup = startup_intreq_irq,
-        .shutdown = shutdown_intreq_irq,
-        .enable = enable_intreq_irq,
-        .disable = disable_intreq_irq,
-        .ack = mask_and_ack_intreq_irq,
-        .end = end_intreq_irq
+static struct irq_chip se7343_irq_chip __read_mostly = {
+        .name           = "SE7343-FPGA",
+        .mask           = disable_se7343_irq,
+        .unmask         = enable_se7343_irq,
+        .mask_ack       = disable_se7343_irq,
 };
 
-static void
-make_intreq_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &intreq_irq_type;
-        disable_intreq_irq(irq);
-}
-
-int
-shmse_irq_demux(int irq)
+static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
-        int bit;
-        volatile u16 val;
-
-        if (irq == IRQ5_IRQ) {
-                /* Read status Register */
-                val = ctrl_inw(PA_CPLD_ST);
-                bit = ffs(val);
-                if (bit != 0)
-                        return OFFCHIP_IRQ_BASE + bit - 1;
+        unsigned short intv = ctrl_inw(PA_CPLD_ST);
+        struct irq_desc *ext_desc;
+        unsigned int ext_irq = SE7343_FPGA_IRQ_BASE;
+
+        intv &= (1 << SE7343_FPGA_IRQ_NR) - 1;
+
+        while (intv) {
+                if (intv & 1) {
+                        ext_desc = irq_desc + ext_irq;
+                        handle_level_irq(ext_irq, ext_desc);
+                }
+                intv >>= 1;
+                ext_irq++;
         }
-        return irq;
 }
 
-/* IRQ5 is multiplexed between the following sources:
- * 1. PC Card socket
- * 2. Extension slot
- * 3. USB Controller
- * 4. Serial Controller
- *
- * We configure IRQ5 as a cascade IRQ.
- */
-static struct irqaction irq5 = {
-        .handler = no_action,
-        .mask = CPU_MASK_NONE,
-        .name = "IRQ5-cascade",
-};
-
-static struct ipr_data se7343_irq5_ipr_map[] = {
-        { IRQ5_IRQ, IRQ5_IPR_ADDR+2, IRQ5_IPR_POS, IRQ5_PRIORITY },
-};
-static struct ipr_data se7343_siof0_vpu_ipr_map[] = {
-        { SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
-        { VPU_IRQ, VPU_IPR_ADDR, VPU_IPR_POS, 8 },
-};
-static struct ipr_data se7343_other_ipr_map[] = {
-        { DMTE0_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE1_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
-        { DMTE5_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
-
-        /* I2C block */
-        { IIC0_ALI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_TACKI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_WAITI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_DTEI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-
-        { IIC1_ALI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY },
-        { IIC1_TACKI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY },
-        { IIC1_WAITI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY },
-        { IIC1_DTEI_IRQ, IIC1_IPR_ADDR, IIC1_IPR_POS, IIC1_PRIORITY },
-
-        /* SIOF */
-        { SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
-
-        /* SIU */
-        { SIU_IRQ, SIU_IPR_ADDR, SIU_IPR_POS, SIU_PRIORITY },
-
-        /* VIO interrupt */
-        { CEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-        { BEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-        { VEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-
-        /*MFI interrupt*/
-
-        { MFI_IRQ, MFI_IPR_ADDR, MFI_IPR_POS, MFI_PRIORITY },
-
-        /* LCD controller */
-        { LCDC_IRQ, LCDC_IPR_ADDR, LCDC_IPR_POS, LCDC_PRIORITY },
-};
-
 /*
  * Initialize IRQ setting
  */
-void __init
-init_7343se_IRQ(void)
+void __init init_7343se_IRQ(void)
 {
-        /* Setup Multiplexed interrupts */
-        ctrl_outw(8, PA_CPLD_MODESET);  /* Set all CPLD interrupts to active
-                                         * low.
-                                         */
-        /* Mask all CPLD controller interrupts */
-        ctrl_outw(0x0fff, PA_CPLD_IMSK);
-
-        /* PC Card interrupts */
-        make_intreq_irq(PC_IRQ0);
-        make_intreq_irq(PC_IRQ1);
-        make_intreq_irq(PC_IRQ2);
-        make_intreq_irq(PC_IRQ3);
-
-        /* Extension Slot Interrupts */
-        make_intreq_irq(EXT_IRQ0);
-        make_intreq_irq(EXT_IRQ1);
-        make_intreq_irq(EXT_IRQ2);
-        make_intreq_irq(EXT_IRQ3);
-
-        /* USB Controller interrupts */
-        make_intreq_irq(USB_IRQ0);
-        make_intreq_irq(USB_IRQ1);
-
-        /* Serial Controller interrupts */
-        make_intreq_irq(UART_IRQ0);
-        make_intreq_irq(UART_IRQ1);
-
-        /* Setup all external interrupts to be active low */
-        ctrl_outw(0xaaaa, INTC_ICR1);
-
-        make_ipr_irq(se7343_irq5_ipr_map, ARRAY_SIZE(se7343_irq5_ipr_map));
-
-        setup_irq(IRQ5_IRQ, &irq5);
-        /* Set port control to use IRQ5 */
-        *(u16 *)0xA4050108 &= ~0xc;
-
-        make_ipr_irq(se7343_siof0_vpu_ipr_map, ARRAY_SIZE(se7343_siof0_vpu_ipr_map));
-
-        ctrl_outb(0x0f, INTC_IMCR5);    /* enable SCIF IRQ */
-
-        make_ipr_irq(se7343_other_ipr_map, ARRAY_SIZE(se7343_other_ipr_map));
-
-        ctrl_outw(0x2000, PA_MRSHPC + 0x0c);    /* mrshpc irq enable */
+        int i;
+
+        ctrl_outw(0, PA_CPLD_IMSK);     /* disable all irqs */
+        ctrl_outw(0x2000, 0xb03fffec);  /* mrshpc irq enable */
+
+        for (i = 0; i < SE7343_FPGA_IRQ_NR; i++)
+                set_irq_chip_and_handler_name(SE7343_FPGA_IRQ_BASE + i,
+                                              &se7343_irq_chip,
+                                              handle_level_irq, "level");
+
+        set_irq_chained_handler(IRQ0_IRQ, se7343_irq_demux);
+        set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_chained_handler(IRQ1_IRQ, se7343_irq_demux);
+        set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_chained_handler(IRQ4_IRQ, se7343_irq_demux);
+        set_irq_type(IRQ4_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_chained_handler(IRQ5_IRQ, se7343_irq_demux);
+        set_irq_type(IRQ5_IRQ, IRQ_TYPE_LEVEL_LOW);
 }
diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c
index c9431b3a051b..8ae718d6c710 100644
--- a/arch/sh/boards/se/7343/setup.c
+++ b/arch/sh/boards/se/7343/setup.c
@@ -1,10 +1,11 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
 #include <asm/machvec.h>
 #include <asm/mach/se7343.h>
+#include <asm/heartbeat.h>
 #include <asm/irq.h>
-
-void init_7343se_IRQ(void);
+#include <asm/io.h>
 
 static struct resource smc91x_resources[] = {
         [0] = {
@@ -17,8 +18,8 @@ static struct resource smc91x_resources[] = {
                  * shared with other devices via externel
                  * interrupt controller in FPGA...
                  */
-                .start  = EXT_IRQ2,
-                .end    = EXT_IRQ2,
+                .start  = SMC_IRQ,
+                .end    = SMC_IRQ,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -38,16 +39,65 @@ static struct resource heartbeat_resources[] = {
         },
 };
 
+static struct heartbeat_data heartbeat_data = {
+        .regsize = 16,
+};
+
 static struct platform_device heartbeat_device = {
         .name           = "heartbeat",
         .id             = -1,
+        .dev = {
+                .platform_data = &heartbeat_data,
+        },
         .num_resources  = ARRAY_SIZE(heartbeat_resources),
         .resource       = heartbeat_resources,
 };
 
+static struct mtd_partition nor_flash_partitions[] = {
+        {
+                .name           = "loader",
+                .offset         = 0x00000000,
+                .size           = 128 * 1024,
+        },
+        {
+                .name           = "rootfs",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 31 * 1024 * 1024,
+        },
+        {
+                .name           = "data",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct physmap_flash_data nor_flash_data = {
+        .width          = 2,
+        .parts          = nor_flash_partitions,
+        .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
+};
+
+static struct resource nor_flash_resources[] = {
+        [0]     = {
+                .start  = 0x00000000,
+                .end    = 0x01ffffff,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device nor_flash_device = {
+        .name           = "physmap-flash",
+        .dev            = {
+                .platform_data  = &nor_flash_data,
+        },
+        .num_resources  = ARRAY_SIZE(nor_flash_resources),
+        .resource       = nor_flash_resources,
+};
+
 static struct platform_device *sh7343se_platform_devices[] __initdata = {
         &smc91x_device,
         &heartbeat_device,
+        &nor_flash_device,
 };
 
 static int __init sh7343se_devices_setup(void)
@@ -55,10 +105,19 @@ static int __init sh7343se_devices_setup(void)
         return platform_add_devices(sh7343se_platform_devices,
                                     ARRAY_SIZE(sh7343se_platform_devices));
 }
+device_initcall(sh7343se_devices_setup);
 
+/*
+ * Initialize the board
+ */
 static void __init sh7343se_setup(char **cmdline_p)
 {
-        device_initcall(sh7343se_devices_setup);
+        ctrl_outw(0xf900, FPGA_OUT);    /* FPGA */
+
+        ctrl_outw(0x0002, PORT_PECR);   /* PORT E 1 = IRQ5 */
+        ctrl_outw(0x0020, PORT_PSELD);
+
+        printk(KERN_INFO "MS7343CP01 Setup...done\n");
 }
 
 /*
@@ -90,5 +149,4 @@ static struct sh_machine_vector mv_7343se __initmv = {
         .mv_outsl = sh7343se_outsl,
 
         .mv_init_irq = init_7343se_IRQ,
-        .mv_irq_demux = shmse_irq_demux,
 };
diff --git a/arch/sh/boards/se/770x/io.c b/arch/sh/boards/se/770x/io.c
index c4550473d4c3..b1ec085b8673 100644
--- a/arch/sh/boards/se/770x/io.c
+++ b/arch/sh/boards/se/770x/io.c
@@ -1,25 +1,13 @@
-/* $Id: io.c,v 1.7 2006/02/05 21:55:29 lethal Exp $
- *
- * linux/arch/sh/kernel/io_se.c
- *
+/*
  * Copyright (C) 2000  Kazumoto Kojima
  *
  * I/O routine for Hitachi SolutionEngine.
- *
  */
-
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/se.h>
 
-/* SH pcmcia io window base, start and end.  */
-int sh_pcic_io_wbase = 0xb8400000;
-int sh_pcic_io_start;
-int sh_pcic_io_stop;
-int sh_pcic_io_type;
-int sh_pcic_io_dummy;
-
 /* MS7750 requires special versions of in*, out* routines, since
    PC-like io ports are located at upper half byte of 16-bit word which
    can be accessed only with 16-bit wide.  */
@@ -33,8 +21,6 @@ port2adr(unsigned int port)
                 return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
         else if (port >= 0x1000)
                 return (volatile __u16 *) (PA_83902 + (port << 1));
-        else if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
-                return (volatile __u16 *) (sh_pcic_io_wbase + (port &~ 1));
         else
                 return (volatile __u16 *) (PA_SUPERIO + (port << 1));
 }
@@ -51,32 +37,27 @@ shifted_port(unsigned long port)
 
 unsigned char se_inb(unsigned long port)
 {
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
-                return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port); 
-        else if (shifted_port(port))
-                return (*port2adr(port) >> 8); 
+        if (shifted_port(port))
+                return (*port2adr(port) >> 8);
         else
-                return (*port2adr(port))&0xff; 
+                return (*port2adr(port))&0xff;
 }
 
 unsigned char se_inb_p(unsigned long port)
 {
         unsigned long v;
 
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
-                v = *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port); 
-        else if (shifted_port(port))
-                v = (*port2adr(port) >> 8); 
+        if (shifted_port(port))
+                v = (*port2adr(port) >> 8);
         else
-                v = (*port2adr(port))&0xff; 
+                v = (*port2adr(port))&0xff;
         ctrl_delay();
         return v;
 }
 
 unsigned short se_inw(unsigned long port)
 {
-        if (port >= 0x2000 ||
-            (sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
+        if (port >= 0x2000)
                 return *port2adr(port);
         else
                 maybebadio(port);
@@ -91,9 +72,7 @@ unsigned int se_inl(unsigned long port)
 
 void se_outb(unsigned char value, unsigned long port)
 {
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
-                *(__u8 *)(sh_pcic_io_wbase + port) = value; 
-        else if (shifted_port(port))
+        if (shifted_port(port))
                 *(port2adr(port)) = value << 8;
         else
                 *(port2adr(port)) = value;
@@ -101,9 +80,7 @@ void se_outb(unsigned char value, unsigned long port)
 
 void se_outb_p(unsigned char value, unsigned long port)
 {
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
-                *(__u8 *)(sh_pcic_io_wbase + port) = value; 
-        else if (shifted_port(port))
+        if (shifted_port(port))
                 *(port2adr(port)) = value << 8;
         else
                 *(port2adr(port)) = value;
@@ -112,8 +89,7 @@ void se_outb_p(unsigned char value, unsigned long port)
 
 void se_outw(unsigned short value, unsigned long port)
 {
-        if (port >= 0x2000 ||
-            (sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
+        if (port >= 0x2000)
                 *port2adr(port) = value;
         else
                 maybebadio(port);
@@ -129,11 +105,7 @@ void se_insb(unsigned long port, void *addr, unsigned long count)
         volatile __u16 *p = port2adr(port);
         __u8 *ap = addr;
 
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) {
-                volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + 0x40000 + port); 
-                while (count--)
-                        *ap++ = *bp;
-        } else if (shifted_port(port)) {
+        if (shifted_port(port)) {
                 while (count--)
                         *ap++ = *p >> 8;
         } else {
@@ -160,11 +132,7 @@ void se_outsb(unsigned long port, const void *addr, unsigned long count)
         volatile __u16 *p = port2adr(port);
         const __u8 *ap = addr;
 
-        if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) {
-                volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + port); 
-                while (count--)
-                        *bp = *ap++;
-        } else if (shifted_port(port)) {
+        if (shifted_port(port)) {
                 while (count--)
                         *p = *ap++ << 8;
         } else {
@@ -177,6 +145,7 @@ void se_outsw(unsigned long port, const void *addr, unsigned long count)
 {
         volatile __u16 *p = port2adr(port);
         const __u16 *ap = addr;
+
         while (count--)
                 *p = *ap++;
 }
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c
index 318bc8a3969c..cf4a5ba12df4 100644
--- a/arch/sh/boards/se/770x/setup.c
+++ b/arch/sh/boards/se/770x/setup.c
@@ -14,8 +14,6 @@
 #include <asm/smc37c93x.h>
 #include <asm/heartbeat.h>
 
-void init_se_IRQ(void);
-
 /*
  * Configure the Super I/O chip
  */
@@ -73,7 +71,7 @@ static struct resource cf_ide_resources[] = {
         },
         [1] = {
                 .start  = PA_MRSHPC_IO + 0x1f0 + 0x206,
-                .end    = PA_MRSHPC_IO + 0x1f0 +8 + 0x206 + 8,
+                .end    = PA_MRSHPC_IO + 0x1f0 + 8 + 0x206 + 8,
                 .flags  = IORESOURCE_MEM,
         },
         [2] = {
@@ -115,9 +113,58 @@ static struct platform_device heartbeat_device = {
         .resource       = heartbeat_resources,
 };
 
+/* SH771X Ethernet driver */
+static struct resource sh_eth0_resources[] = {
+        [0] = {
+                .start = SH_ETH0_BASE,
+                .end = SH_ETH0_BASE + 0x1B8,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = SH_ETH0_IRQ,
+                .end = SH_ETH0_IRQ,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sh_eth0_device = {
+        .name = "sh-eth",
+        .id     = 0,
+        .dev = {
+                .platform_data = PHY_ID,
+        },
+        .num_resources = ARRAY_SIZE(sh_eth0_resources),
+        .resource = sh_eth0_resources,
+};
+
+static struct resource sh_eth1_resources[] = {
+        [0] = {
+                .start = SH_ETH1_BASE,
+                .end = SH_ETH1_BASE + 0x1B8,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = SH_ETH1_IRQ,
+                .end = SH_ETH1_IRQ,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sh_eth1_device = {
+        .name = "sh-eth",
+        .id     = 1,
+        .dev = {
+                .platform_data = PHY_ID,
+        },
+        .num_resources = ARRAY_SIZE(sh_eth1_resources),
+        .resource = sh_eth1_resources,
+};
+
 static struct platform_device *se_devices[] __initdata = {
         &heartbeat_device,
         &cf_ide_device,
+        &sh_eth0_device,
+        &sh_eth1_device,
 };
 
 static int __init se_devices_setup(void)
diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c
index ede3957fc14a..6e228ea59788 100644
--- a/arch/sh/boards/se/7722/setup.c
+++ b/arch/sh/boards/se/7722/setup.c
@@ -16,6 +16,7 @@
 #include <linux/input.h>
 #include <linux/smc91x.h>
 #include <asm/machvec.h>
+#include <asm/clock.h>
 #include <asm/se7722.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
@@ -145,6 +146,8 @@ static struct platform_device *se7722_devices[] __initdata = {
 
 static int __init se7722_devices_setup(void)
 {
+        clk_always_enable("mstp214"); /* KEYSC */
+
         return platform_add_devices(se7722_devices,
                 ARRAY_SIZE(se7722_devices));
 }
@@ -154,11 +157,6 @@ static void __init se7722_setup(char **cmdline_p)
 {
         ctrl_outw(0x010D, FPGA_OUT);    /* FPGA */
 
-        ctrl_outl(0x00051001, MSTPCR0);
-        ctrl_outl(0x00000000, MSTPCR1);
-        /* KEYSC, VOU, BEU, CEU, VEU, VPU, LCDC, USB */
-        ctrl_outl(0xffffb7c0, MSTPCR2);
-
         ctrl_outw(0x0000, PORT_PECR);   /* PORT E 1 = IRQ5 ,E 0 = BS */
         ctrl_outw(0x1000, PORT_PJCR);   /* PORT J 1 = IRQ1,J 0 =IRQ0 */
 
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 89b408620dcb..8b37869a8227 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -40,7 +40,7 @@ KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%08x" \
 KERNEL_ENTRY    := $(shell /bin/bash -c 'printf "0x%08x" \
                      $$[$(CONFIG_PAGE_OFFSET)  + \
                         $(CONFIG_MEMORY_START) + \
-                        $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
+                        $(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]')
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
diff --git a/arch/sh/boot/compressed/Makefile_32 b/arch/sh/boot/compressed/Makefile_32
index c0d25fb1aa60..47685f618ae7 100644
--- a/arch/sh/boot/compressed/Makefile_32
+++ b/arch/sh/boot/compressed/Makefile_32
@@ -35,8 +35,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE
 $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
         $(call if_changed,gzip)
 
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T
 OBJCOPYFLAGS += -R .empty_zero_page
 
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
-        $(call if_changed,ld)
+$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE
+        $(call if_changed,as_o_S)
diff --git a/arch/sh/boot/compressed/Makefile_64 b/arch/sh/boot/compressed/Makefile_64
index 912f3e205a0d..658d4f915556 100644
--- a/arch/sh/boot/compressed/Makefile_64
+++ b/arch/sh/boot/compressed/Makefile_64
@@ -37,8 +37,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE
 $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
         $(call if_changed,gzip)
 
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
 OBJCOPYFLAGS += -R .empty_zero_page
 
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
-        $(call if_changed,ld)
+$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE
+        $(call if_changed,as_o_S)
diff --git a/arch/sh/boot/compressed/piggy.S b/arch/sh/boot/compressed/piggy.S
new file mode 100644
index 000000000000..566071926b13
--- /dev/null
+++ b/arch/sh/boot/compressed/piggy.S
@@ -0,0 +1,8 @@
+        .global input_len, input_data
+        .data
+input_len:
+        .long   input_data_end - input_data
+input_data:
+        .incbin "arch/sh/boot/compressed/vmlinux.bin.gz"
+input_data_end:
+        .end
diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr
deleted file mode 100644
index 1ed9d791f863..000000000000
--- a/arch/sh/boot/compressed/vmlinux.scr
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTIONS
-{
-  .data : { 
-        input_len = .;
-        LONG(input_data_end - input_data) input_data = .; 
-        *(.data) 
-        input_data_end = .; 
-        }
-}
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
new file mode 100644
index 000000000000..5471df53753c
--- /dev/null
+++ b/arch/sh/configs/ap325rxa_defconfig
@@ -0,0 +1,947 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc4
+# Wed Jun  4 17:30:00 2008
+#
+CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+CONFIG_CPU_SHX2=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+CONFIG_CPU_SUBTYPE_SH7723=y
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
+
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x08000000
+CONFIG_MEMORY_SIZE=0x08000000
+CONFIG_29BIT=y
+# CONFIG_X2TLB is not set
+CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+# CONFIG_SH_STORE_QUEUES is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_PTEA=y
+CONFIG_CPU_HAS_FPU=y
+
+#
+# Board support
+#
+CONFIG_SH_AP325RXA=y
+
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=16
+CONFIG_SH_PCLK_FREQ=33333333
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_HEARTBEAT is not set
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_GUSA=y
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp"
+
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xffffffff
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_STNIC is not set
+# CONFIG_SMC91X is not set
+CONFIG_SMC911X=y
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=6
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_SH_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index 84c0075e2ad4..7b7273638447 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -1,40 +1,55 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Tue Oct  3 11:46:17 2006
+# Linux kernel version: 2.6.26-rc8
+# Mon Jul  7 13:12:45 2008
 #
 CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -46,33 +61,41 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 # CONFIG_SHMEM is not set
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -86,62 +109,28 @@ CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_CLASSIC_RCU=y
 
 #
 # System type
 #
-CONFIG_SOLUTION_ENGINE=y
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-CONFIG_SH_7343_SOLUTION_ENGINE=y
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_UNKNOWN is not set
-
-#
-# Processor selection
-#
 CONFIG_CPU_SH4=y
 CONFIG_CPU_SH4A=y
 CONFIG_CPU_SH4AL_DSP=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-
-#
-# SH-3 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
 # CONFIG_CPU_SUBTYPE_SH7707 is not set
 # CONFIG_CPU_SUBTYPE_SH7708 is not set
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
-
-#
-# SH-4 Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -150,67 +139,88 @@ CONFIG_CPU_SH4AL_DSP=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7723 is not set
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
 CONFIG_CPU_SUBTYPE_SH7343=y
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
 
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x01000000
-CONFIG_32BIT=y
+CONFIG_29BIT=y
 CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
 
 #
 # Processor features
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_SH_FPU is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_SH_FPU_EMU is not set
 CONFIG_SH_DSP=y
 # CONFIG_SH_STORE_QUEUES is not set
 CONFIG_CPU_HAS_INTEVT=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_DSP=y
+
+#
+# Board support
+#
+CONFIG_SOLUTION_ENGINE=y
+CONFIG_SH_7343_SOLUTION_ENGINE=y
 
 #
-# Timer support
+# Timer and clock configuration
 #
 CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=16
 CONFIG_SH_PCLK_FREQ=27000000
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 
 #
 # CPU Frequency scaling
@@ -225,57 +235,50 @@ CONFIG_SH_PCLK_FREQ=27000000
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
+
+#
+# Additional SuperH Device Drivers
+#
 CONFIG_HEARTBEAT=y
+# CONFIG_PUSH_SWITCH is not set
 
 #
 # Kernel features
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
 # CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
+CONFIG_GUSA=y
 
 #
 # Boot options
 #
 CONFIG_ZERO_PAGE_OFFSET=0x00001000
 CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
 # CONFIG_CMDLINE_BOOL is not set
 
 #
 # Bus options
 #
-# CONFIG_PCI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+# CONFIG_CF_ENABLER is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
 # Networking
 #
 CONFIG_NET=y
@@ -283,22 +286,20 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
+# CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_ARPD is not set
@@ -310,29 +311,18 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -345,10 +335,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -356,9 +342,20 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -367,36 +364,32 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
 
 #
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -422,13 +415,15 @@ CONFIG_MTD_CFI_UTIL=y
 CONFIG_MTD_RAM=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -445,130 +440,101 @@ CONFIG_MTD_RAM=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
 
 #
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
+# SCSI support type (disk, tape, CD-ROM)
 #
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
 
 #
-# I2O device support
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
-# Network device support
+# SCSI Transports
 #
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_STNIC is not set
 CONFIG_SMC91X=y
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_E1000E_ENABLED is not set
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -576,13 +542,13 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_EVDEV is not set
 # CONFIG_INPUT_EVBUG is not set
 
@@ -592,6 +558,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -608,6 +575,7 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -626,147 +594,102 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_UNIX98_PTYS is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-
-#
-# I2C Algorithms
-#
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
+# CONFIG_I2C is not set
 # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Dallas's 1-wire bus
+# Sonics Silicon Backplane
 #
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
-# Misc devices
+# Multimedia devices
 #
 
 #
-# Multimedia devices
+# Multimedia core support
 #
 CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L2_COMMON=y
+CONFIG_VIDEO_ALLOW_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=y
 
 #
-# Video Capture Adapters
+# Multimedia drivers
 #
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-
-#
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_SOC_CAMERA is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DAB is not set
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 # CONFIG_FB_CFB_FILLRECT is not set
 # CONFIG_FB_CFB_COPYAREA is not set
 # CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_EPSON1355 is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Console display driver support
+# Display device support
 #
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
-# Logo configuration
+# Console display driver support
 #
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -802,85 +725,63 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_MPU401 is not set
 
 #
-# Open Sound System
+# SUPERH devices
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# USB support
+# System on Chip audio support
 #
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_SND_SOC is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# SoC Audio support for SuperH
 #
 
 #
-# USB Gadget Support
+# ALSA SoC audio for Freescale SOCs
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# SoC Audio for the Texas Instruments OMAP
 #
-# CONFIG_MMC is not set
 
 #
-# LED devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
+# CONFIG_UIO is not set
 
 #
 # File systems
 #
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+# CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
 # CONFIG_QUOTA is not set
-# CONFIG_DNOTIFY is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -909,7 +810,6 @@ CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -922,40 +822,39 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=y
 # CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
+# CONFIG_NFSD_V4 is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -963,56 +862,130 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 # CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
+# CONFIG_DLM is not set
 
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_SH_STANDARD_BIOS is not set
-# CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_KGDB is not set
+CONFIG_EARLY_SCIF_CONSOLE=y
+CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
+CONFIG_EARLY_PRINTK=y
+# CONFIG_SH_KGDB is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
 
 #
-# Cryptographic options
+# Compression
 #
-# CONFIG_CRYPTO is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index 2dd83af988f0..7be79cd04eb0 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -1,53 +1,57 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc4
-# Wed Mar 28 10:19:02 2007
+# Linux kernel version: 2.6.26-rc6
+# Wed Jun 18 16:36:08 2008
 #
 CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -55,33 +59,41 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 # CONFIG_BUG is not set
 CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 # CONFIG_SHMEM is not set
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -95,57 +107,17 @@ CONFIG_IOSCHED_NOOP=y
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
+CONFIG_CLASSIC_RCU=y
 
 #
 # System type
 #
-CONFIG_SOLUTION_ENGINE=y
-CONFIG_SH_SOLUTION_ENGINE=y
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_HIGHLANDER is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_7206_SOLUTION_ENGINE is not set
-# CONFIG_SH_7619_SOLUTION_ENGINE is not set
-# CONFIG_SH_LBOX_RE2 is not set
-# CONFIG_SH_UNKNOWN is not set
-
-#
-# Processor selection
-#
 CONFIG_CPU_SH3=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 # CONFIG_CPU_SUBTYPE_SH7619 is not set
-
-#
-# SH-2A Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
 # CONFIG_CPU_SUBTYPE_SH7206 is not set
-
-#
-# SH-3 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
 # CONFIG_CPU_SUBTYPE_SH7707 is not set
@@ -153,10 +125,8 @@ CONFIG_CPU_SH3=y
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
 CONFIG_CPU_SUBTYPE_SH7712=y
-
-#
-# SH-4 Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -165,37 +135,37 @@ CONFIG_CPU_SUBTYPE_SH7712=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
+# CONFIG_CPU_SUBTYPE_SH7723 is not set
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
 # CONFIG_CPU_SUBTYPE_SH7785 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
 # CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
 
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x02000000
+CONFIG_29BIT=y
 CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -203,21 +173,21 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-CONFIG_CF_ENABLER=y
-# CONFIG_CF_AREA5 is not set
-CONFIG_CF_AREA6=y
-CONFIG_CF_BASE_ADDR=0xb8000000
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
 
 #
 # Processor features
@@ -230,6 +200,14 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_HAS_INTEVT=y
 CONFIG_CPU_HAS_IPR_IRQ=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_DSP=y
+
+#
+# Board support
+#
+CONFIG_SOLUTION_ENGINE=y
+CONFIG_SH_SOLUTION_ENGINE=y
+# CONFIG_SH_AP325RXA is not set
 
 #
 # Timer and clock configuration
@@ -237,6 +215,10 @@ CONFIG_CPU_HAS_SR_RB=y
 CONFIG_SH_TMU=y
 CONFIG_SH_TIMER_IRQ=16
 CONFIG_SH_PCLK_FREQ=66666666
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 
 #
 # CPU Frequency scaling
@@ -251,7 +233,6 @@ CONFIG_SH_PCLK_FREQ=66666666
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 
 #
 # Additional SuperH Device Drivers
@@ -267,48 +248,40 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
 # CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+CONFIG_GUSA=y
+# CONFIG_GUSA_RB is not set
 
 #
 # Boot options
 #
 CONFIG_ZERO_PAGE_OFFSET=0x00001000
 CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
 
 #
 # Bus options
 #
-# CONFIG_PCI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+CONFIG_CF_ENABLER=y
+# CONFIG_CF_AREA5 is not set
+CONFIG_CF_AREA6=y
+CONFIG_CF_BASE_ADDR=0xb8000000
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
 # Networking
 #
 CONFIG_NET=y
@@ -316,7 +289,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -324,6 +296,7 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
@@ -334,11 +307,10 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -355,30 +327,17 @@ CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -391,15 +350,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -408,6 +359,7 @@ CONFIG_NET_SCH_CBQ=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_HFSC=y
 CONFIG_NET_SCH_PRIO=y
+# CONFIG_NET_SCH_RR is not set
 CONFIG_NET_SCH_RED=y
 CONFIG_NET_SCH_SFQ=y
 CONFIG_NET_SCH_TEQL=y
@@ -415,7 +367,6 @@ CONFIG_NET_SCH_TBF=y
 CONFIG_NET_SCH_GRED=y
 CONFIG_NET_SCH_DSMARK=y
 CONFIG_NET_SCH_NETEM=y
-CONFIG_NET_SCH_INGRESS=y
 
 #
 # Classification
@@ -429,50 +380,55 @@ CONFIG_NET_CLS_FW=y
 # CONFIG_NET_CLS_U32 is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_POLICE is not set
 CONFIG_NET_CLS_IND=y
-CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
 # Device Drivers
 #
 
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -485,6 +441,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -510,7 +467,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -533,44 +489,25 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
@@ -578,6 +515,7 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -599,6 +537,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -606,94 +545,72 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_MV is not set
 CONFIG_PATA_PLATFORM=y
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
-# CONFIG_NET_ETHERNET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=y
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_STNIC is not set
+CONFIG_SH_ETH=y
+# CONFIG_SMC91X is not set
+# CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_E1000E_ENABLED is not set
+CONFIG_NETDEV_10000=y
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -711,6 +628,7 @@ CONFIG_NETDEVICES=y
 # Character devices
 #
 # CONFIG_VT is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -728,99 +646,78 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
-
-#
-# SPI support
-#
 # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Hardware Monitoring support
+# Sonics Silicon Backplane
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia drivers
 #
-# CONFIG_DVB is not set
+# CONFIG_DAB is not set
 
 #
 # Graphics support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
-# USB support
+# Sound
 #
-# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_SOUND is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-
-#
-# USB Gadget Support
-#
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
+# CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -834,40 +731,10 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_TIMER is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -877,20 +744,21 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+# CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
 # CONFIG_QUOTA is not set
-# CONFIG_DNOTIFY is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -919,7 +787,6 @@ CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -935,68 +802,67 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 # CONFIG_NLS is not set
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
 
 #
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -1004,21 +870,28 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_SH_STANDARD_BIOS is not set
 # CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_DEBUG_BOOTMEM is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_4KSTACKS is not set
+# CONFIG_IRQSTACKS is not set
 # CONFIG_SH_KGDB is not set
 
 #
@@ -1026,62 +899,100 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
 
 #
-# Cryptographic options
+# Crypto core or helper
 #
-CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
 # CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
 
 #
-# Hardware crypto devices
+# Compression
 #
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
new file mode 100644
index 000000000000..83f3fe5db3e5
--- /dev/null
+++ b/arch/sh/configs/sh7763rdp_defconfig
@@ -0,0 +1,1052 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc4
+# Fri Jun  6 12:20:17 2008
+#
+CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=y
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_SH7723 is not set
+CONFIG_CPU_SUBTYPE_SH7763=y
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
+
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_29BIT=y
+CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+# CONFIG_SH_STORE_QUEUES is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_FPU=y
+
+#
+# Board support
+#
+CONFIG_SH_SH7763RDP=y
+
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=28
+CONFIG_SH_PCLK_FREQ=66666666
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_HEARTBEAT is not set
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_GUSA=y
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10"
+
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=y
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_STNIC is not set
+# CONFIG_SMC91X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=3
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=y
+CONFIG_NLS_CODEPAGE_775=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+CONFIG_NLS_CODEPAGE_855=y
+CONFIG_NLS_CODEPAGE_857=y
+CONFIG_NLS_CODEPAGE_860=y
+CONFIG_NLS_CODEPAGE_861=y
+CONFIG_NLS_CODEPAGE_862=y
+CONFIG_NLS_CODEPAGE_863=y
+CONFIG_NLS_CODEPAGE_864=y
+CONFIG_NLS_CODEPAGE_865=y
+CONFIG_NLS_CODEPAGE_866=y
+CONFIG_NLS_CODEPAGE_869=y
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_CODEPAGE_950=y
+CONFIG_NLS_CODEPAGE_932=y
+CONFIG_NLS_CODEPAGE_949=y
+CONFIG_NLS_CODEPAGE_874=y
+CONFIG_NLS_ISO8859_8=y
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_CODEPAGE_1251=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+CONFIG_NLS_ISO8859_3=y
+CONFIG_NLS_ISO8859_4=y
+CONFIG_NLS_ISO8859_5=y
+CONFIG_NLS_ISO8859_6=y
+CONFIG_NLS_ISO8859_7=y
+CONFIG_NLS_ISO8859_9=y
+CONFIG_NLS_ISO8859_13=y
+CONFIG_NLS_ISO8859_14=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_KOI8_R=y
+CONFIG_NLS_KOI8_U=y
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_SH_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
new file mode 100644
index 000000000000..ff72697365d1
--- /dev/null
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -0,0 +1,1388 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc8
+# Tue Jul 15 21:37:59 2008
+#
+CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_SYS_SUPPORTS_NUMA=y
+CONFIG_SYS_SUPPORTS_PCI=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_IO_TRAPPED=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+# CONFIG_OPROFILE is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+CONFIG_CPU_SHX2=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_SH7723 is not set
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+CONFIG_CPU_SUBTYPE_SH7785=y
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+# CONFIG_CPU_SUBTYPE_SH5_101 is not set
+# CONFIG_CPU_SUBTYPE_SH5_103 is not set
+
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x08000000
+CONFIG_MEMORY_SIZE=0x08000000
+CONFIG_29BIT=y
+# CONFIG_PMB is not set
+# CONFIG_X2TLB is not set
+CONFIG_VSYSCALL=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=2
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+CONFIG_SH_STORE_QUEUES=y
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_PTEA=y
+CONFIG_CPU_HAS_FPU=y
+
+#
+# Board support
+#
+# CONFIG_SH_HIGHLANDER is not set
+CONFIG_SH_SH7785LCR=y
+CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
+
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=28
+CONFIG_SH_PCLK_FREQ=50000000
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+
+#
+# Additional SuperH Device Drivers
+#
+CONFIG_HEARTBEAT=y
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_GUSA=y
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x00000000
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=6
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_ALGOPCA=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+CONFIG_I2C_PCA_PLATFORM=y
+# CONFIG_I2C_SH_MOBILE is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_SM501=y
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+CONFIG_FB_SM501=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_SUPERH_MONO is not set
+# CONFIG_LOGO_SUPERH_VGA16 is not set
+# CONFIG_LOGO_SUPERH_CLUT224 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+CONFIG_USB_R8A66597_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=m
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_RS5C372=y
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_SH is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_DEBUG_BOOTMEM is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_4KSTACKS is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_SH_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index 0718805774e8..847e90894d1b 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_SH_LANDISK)		+= ops-landisk.o
 obj-$(CONFIG_SH_LBOX_RE2)               += ops-lboxre2.o fixups-lboxre2.o
 obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)   += ops-se7780.o fixups-se7780.o
 obj-$(CONFIG_SH_CAYMAN)                 += ops-cayman.o
+obj-$(CONFIG_SH_SH7785LCR)              += ops-sh7785lcr.o fixups-sh7785lcr.o
diff --git a/arch/sh/drivers/pci/fixups-sh7785lcr.c b/arch/sh/drivers/pci/fixups-sh7785lcr.c
new file mode 100644
index 000000000000..4949e601387a
--- /dev/null
+++ b/arch/sh/drivers/pci/fixups-sh7785lcr.c
@@ -0,0 +1,46 @@
+/*
+ * arch/sh/drivers/pci/fixups-sh7785lcr.c
+ *
+ * R0P7785LC0011RL PCI fixups
+ * Copyright (C) 2008  Yoshihiro Shimoda
+ *
+ * Based on arch/sh/drivers/pci/fixups-r7780rp.c
+ * Copyright (C) 2003  Lineo uSolutions, Inc.
+ * Copyright (C) 2004 - 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/pci.h>
+#include "pci-sh4.h"
+
+int pci_fixup_pcic(void)
+{
+        pci_write_reg(0x000043ff, SH4_PCIINTM);
+        pci_write_reg(0x0000380f, SH4_PCIAINTM);
+
+        pci_write_reg(0xfbb00047, SH7780_PCICMD);
+        pci_write_reg(0x00000000, SH7780_PCIIBAR);
+
+        pci_write_reg(0x00011912, SH7780_PCISVID);
+        pci_write_reg(0x08000000, SH7780_PCICSCR0);
+        pci_write_reg(0x0000001b, SH7780_PCICSAR0);
+        pci_write_reg(0xfd000000, SH7780_PCICSCR1);
+        pci_write_reg(0x0000000f, SH7780_PCICSAR1);
+
+        pci_write_reg(0xfd000000, SH7780_PCIMBR0);
+        pci_write_reg(0x00fc0000, SH7780_PCIMBMR0);
+
+#ifdef CONFIG_32BIT
+        pci_write_reg(0xc0000000, SH7780_PCIMBR2);
+        pci_write_reg(0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2);
+#endif
+
+        /* Set IOBR for windows containing area specified in pci.h */
+        pci_write_reg((PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE - 1)),
+                      SH7780_PCIIOBR);
+        pci_write_reg(((SH7780_PCI_IO_SIZE - 1) & (7 << 18)), SH7780_PCIIOBMR);
+
+        return 0;
+}
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index e1284fc69361..f54c291db37b 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -48,6 +49,7 @@ struct pci_channel board_pci_channels[] = {
           &gapspci_mem_resource, 0, 1 },
         { 0, }
 };
+EXPORT_SYMBOL(board_pci_channels);
 
 /*
  * The !gapspci_config_access case really shouldn't happen, ever, unless
diff --git a/arch/sh/drivers/pci/ops-sh7785lcr.c b/arch/sh/drivers/pci/ops-sh7785lcr.c
new file mode 100644
index 000000000000..b3bd68702059
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-sh7785lcr.c
@@ -0,0 +1,66 @@
+/*
+ * Author:  Ian DaSilva (idasilva@mvista.com)
+ *
+ * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * PCI initialization for the Renesas R0P7785LC0011RL board
+ * Based on arch/sh/drivers/pci/ops-r7780rp.c
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include "pci-sh4.h"
+
+static char irq_tab[] __initdata = {
+        65, 66, 67, 68,
+};
+
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
+{
+        return irq_tab[slot];
+}
+
+static struct resource sh7785_io_resource = {
+        .name   = "SH7785_IO",
+        .start  = SH7780_PCI_IO_BASE,
+        .end    = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
+        .flags  = IORESOURCE_IO
+};
+
+static struct resource sh7785_mem_resource = {
+        .name   = "SH7785_mem",
+        .start  = SH7780_PCI_MEMORY_BASE,
+        .end    = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
+        .flags  = IORESOURCE_MEM
+};
+
+struct pci_channel board_pci_channels[] = {
+        { &sh4_pci_ops, &sh7785_io_resource, &sh7785_mem_resource, 0, 0xff },
+        { NULL, NULL, NULL, 0, 0 },
+};
+EXPORT_SYMBOL(board_pci_channels);
+
+static struct sh4_pci_address_map sh7785_pci_map = {
+        .window0        = {
+                .base   = SH7780_CS2_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+
+        .window1        = {
+                .base   = SH7780_CS3_BASE_ADDR,
+                .size   = 0x04000000,
+        },
+
+        .flags  = SH4_PCIC_NO_RESET,
+};
+
+int __init pcibios_init_platform(void)
+{
+        return sh7780_pcic_init(&sh7785_pci_map);
+}
diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index ea404704ace8..cf48b12ee58c 100644
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -78,7 +78,7 @@ static struct pci_dev *fake_pci_dev(struct pci_channel *hose,
 }
 
 #define EARLY_PCI_OP(rw, size, type)                                    \
-int early_##rw##_config_##size(struct pci_channel *hose,                \
+static int early_##rw##_config_##size(struct pci_channel *hose,         \
         int top_bus, int bus, int devfn, int offset, type value)        \
 {                                                                       \
         return pci_##rw##_config_##size(                                \
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index f57095a2617c..d3839e609aac 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -135,7 +135,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
  *  If we set up a device for bus mastering, we need to check and set
  *  the latency timer as it may not be properly set.
  */
-unsigned int pcibios_max_latency = 255;
+static unsigned int pcibios_max_latency = 255;
 
 void pcibios_set_master(struct pci_dev *dev)
 {
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
index 4bbdce36b92b..0e6905fe9fec 100644
--- a/arch/sh/kernel/Makefile_32
+++ b/arch/sh/kernel/Makefile_32
@@ -21,7 +21,7 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_PM)                += pm.o
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-obj-$(CONFIG_BINFMT_ELF)        += dump_task.o
+obj-$(CONFIG_ELF_CORE)          += dump_task.o
 obj-$(CONFIG_IO_TRAPPED)        += io_trapped.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index 01ff4d05aab0..d3d9f3204230 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -157,7 +157,7 @@ static int __init cf_init_se(void)
 }
 #endif
 
-int __init cf_init(void)
+static int __init cf_init(void)
 {
         if (mach_is_se() || mach_is_7722se() || mach_is_7721se())
                 return cf_init_se();
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index b5f1e23ed57c..f5eb56e6bc59 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -88,7 +88,7 @@ static void propagate_rate(struct clk *clk)
         }
 }
 
-int __clk_enable(struct clk *clk)
+static int __clk_enable(struct clk *clk)
 {
         /*
          * See if this is the first time we're enabling the clock, some
@@ -111,7 +111,6 @@ int __clk_enable(struct clk *clk)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(__clk_enable);
 
 int clk_enable(struct clk *clk)
 {
@@ -131,7 +130,7 @@ static void clk_kref_release(struct kref *kref)
         /* Nothing to do */
 }
 
-void __clk_disable(struct clk *clk)
+static void __clk_disable(struct clk *clk)
 {
         int count = kref_put(&clk->kref, clk_kref_release);
 
@@ -143,7 +142,6 @@ void __clk_disable(struct clk *clk)
                         clk->ops->disable(clk);
         }
 }
-EXPORT_SYMBOL_GPL(__clk_disable);
 
 void clk_disable(struct clk *clk)
 {
@@ -310,15 +308,11 @@ static int show_clocks(char *buf, char **start, off_t off,
         list_for_each_entry_reverse(clk, &clock_list, node) {
                 unsigned long rate = clk_get_rate(clk);
 
-                /*
-                 * Don't bother listing dummy clocks with no ancestry
-                 * that only support enable and disable ops.
-                 */
-                if (unlikely(!rate && !clk->parent))
-                        continue;
-
-                p += sprintf(p, "%-12s\t: %ld.%02ldMHz\n", clk->name,
-                             rate / 1000000, (rate % 1000000) / 10000);
+                p += sprintf(p, "%-12s\t: %ld.%02ldMHz\t%s\n", clk->name,
+                             rate / 1000000, (rate % 1000000) / 10000,
+                             ((clk->flags & CLK_ALWAYS_ENABLED) ||
+                              (atomic_read(&clk->kref.refcount) != 1)) ?
+                             "enabled" : "disabled");
         }
 
         return p - buf;
diff --git a/arch/sh/kernel/cpu/irq/intc.c b/arch/sh/kernel/cpu/irq/intc.c
index da5dae787888..8c70e201bde0 100644
--- a/arch/sh/kernel/cpu/irq/intc.c
+++ b/arch/sh/kernel/cpu/irq/intc.c
@@ -62,7 +62,7 @@ struct intc_desc_int {
 #endif
 
 static unsigned int intc_prio_level[NR_IRQS]; /* for now */
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 static unsigned long ack_handle[NR_IRQS];
 #endif
 
@@ -231,7 +231,7 @@ static void intc_disable(unsigned int irq)
         }
 }
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 static void intc_mask_ack(unsigned int irq)
 {
         struct intc_desc_int *d = get_intc_desc(irq);
@@ -244,8 +244,23 @@ static void intc_mask_ack(unsigned int irq)
 
         if (handle) {
                 addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);
-                ctrl_inb(addr);
-                ctrl_outb(0x3f ^ set_field(0, 1, handle), addr);
+                switch (_INTC_FN(handle)) {
+                case REG_FN_MODIFY_BASE + 0:    /* 8bit */
+                        ctrl_inb(addr);
+                        ctrl_outb(0xff ^ set_field(0, 1, handle), addr);
+                        break;
+                case REG_FN_MODIFY_BASE + 1:    /* 16bit */
+                        ctrl_inw(addr);
+                        ctrl_outw(0xffff ^ set_field(0, 1, handle), addr);
+                        break;
+                case REG_FN_MODIFY_BASE + 3:    /* 32bit */
+                        ctrl_inl(addr);
+                        ctrl_outl(0xffffffff ^ set_field(0, 1, handle), addr);
+                        break;
+                default:
+                        BUG();
+                        break;
+                }
         }
 }
 #endif
@@ -466,7 +481,7 @@ static unsigned int __init intc_prio_data(struct intc_desc *desc,
         return 0;
 }
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 static unsigned int __init intc_ack_data(struct intc_desc *desc,
                                           struct intc_desc_int *d,
                                           intc_enum enum_id)
@@ -601,7 +616,7 @@ static void __init intc_register_irq(struct intc_desc *desc,
         /* irq should be disabled by default */
         d->chip.mask(irq);
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         if (desc->ack_regs)
                 ack_handle[irq] = intc_ack_data(desc, d, enum_id);
 #endif
@@ -635,7 +650,7 @@ void __init register_intc_controller(struct intc_desc *desc)
         d->nr_reg += desc->prio_regs ? desc->nr_prio_regs * 2 : 0;
         d->nr_reg += desc->sense_regs ? desc->nr_sense_regs : 0;
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         d->nr_reg += desc->ack_regs ? desc->nr_ack_regs : 0;
 #endif
         d->reg = alloc_bootmem(d->nr_reg * sizeof(*d->reg));
@@ -676,7 +691,7 @@ void __init register_intc_controller(struct intc_desc *desc)
         d->chip.mask_ack = intc_disable;
         d->chip.set_type = intc_set_sense;
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         if (desc->ack_regs) {
                 for (i = 0; i < desc->nr_ack_regs; i++)
                         k += save_reg(d, k, desc->ack_regs[i].set_reg, 0);
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index 0fc89069d8c7..ee894e5a45e7 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -3,7 +3,7 @@
  *
  * The SH-2 exception entry
  *
- * Copyright (C) 2005,2006 Yoshinori Sato
+ * Copyright (C) 2005-2008 Yoshinori Sato
  * Copyright (C) 2005  AXE,Inc.
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -36,43 +36,41 @@ OFF_TRA	=  (16*4+6*4)
 #include <asm/entry-macros.S>
 
 ENTRY(exception_handler)
-        ! already saved r0/r1
+        ! stack
+        ! r0 <- point sp
+        ! r1
+        ! pc
+        ! sr
+        ! r0 = temporary
+        ! r1 = vector (pseudo EXPEVT / INTEVT / TRA)
         mov.l   r2,@-sp
         mov.l   r3,@-sp
-        mov     r0,r1
         cli
         mov.l   $cpu_mode,r2
         mov.l   @r2,r0
         mov.l   @(5*4,r15),r3   ! previous SR
-        shll2   r3              ! set "S" flag
-        rotl    r0              ! T <- "S" flag
-        rotl    r0              ! "S" flag is LSB
-        rotcr   r3              ! T -> r3:b30
-        shlr    r3
-        shlr    r0
-        bt/s    1f
-         mov.l  r3,@(5*4,r15)   ! copy cpu mode to SR
+        or      r0,r3           ! set MD
+        tst     r0,r0
+        bf/s    1f              ! previous mode check
+         mov.l  r3,@(5*4,r15)   ! update SR
         ! switch to kernel mode
-        mov     #1,r0
-        rotr    r0
-        rotr    r0
+        mov.l   __md_bit,r0
         mov.l   r0,@r2          ! enter kernel mode
         mov.l   $current_thread_info,r2
         mov.l   @r2,r2
-        mov     #0x20,r0
+        mov     #(THREAD_SIZE >> 8),r0
         shll8   r0
         add     r2,r0
         mov     r15,r2          ! r2 = user stack top
         mov     r0,r15          ! switch kernel stack
-        add     #-4,r15         ! dummy
         mov.l   r1,@-r15        ! TRA
         sts.l   macl, @-r15
         sts.l   mach, @-r15
         stc.l   gbr, @-r15
-        mov.l   @(4*4,r2),r0
-        mov.l   @(5*4,r2),r1
-        mov.l   r1,@-r15        ! original SR
+        mov.l   @(5*4,r2),r0
+        mov.l   r0,@-r15        ! original SR
         sts.l   pr,@-r15
+        mov.l   @(4*4,r2),r0
         mov.l   r0,@-r15        ! original PC
         mov     r2,r3
         add     #(4+2)*4,r3     ! rewind r0 - r3 + exception frame
@@ -88,14 +86,15 @@ ENTRY(exception_handler)
         mov.l   r6,@-r15
         mov.l   r5,@-r15
         mov.l   r4,@-r15
+        mov     r1,r9           ! save TRA
         mov     r2,r8           ! copy user -> kernel stack
-        mov.l   @r8+,r3
+        mov.l   @(0,r8),r3
         mov.l   r3,@-r15
-        mov.l   @r8+,r2
+        mov.l   @(4,r8),r2
         mov.l   r2,@-r15
-        mov.l   @r8+,r1
+        mov.l   @(12,r8),r1
         mov.l   r1,@-r15
-        mov.l   @r8+,r0
+        mov.l   @(8,r8),r0
         bra     2f
          mov.l  r0,@-r15
 1:
@@ -107,10 +106,11 @@ ENTRY(exception_handler)
         mov.l   r0,@-r15        
         mov.l   @r2+,r0         ! old R2
         mov.l   r0,@-r15        
-        mov.l   @r2+,r0         ! old R1
-        mov.l   r0,@-r15        
-        mov.l   @r2+,r0         ! old R0
+        mov.l   @(4,r2),r0      ! old R1
         mov.l   r0,@-r15        
+        mov.l   @r2,r0          ! old R0
+        mov.l   r0,@-r15
+        add     #8,r2
         mov.l   @r2+,r3         ! old PC
         mov.l   @r2+,r0         ! old SR
         add     #-4,r2          ! exception frame stub (sr)
@@ -135,14 +135,12 @@ ENTRY(exception_handler)
         mov.l   r6,@-r2
         mov.l   r5,@-r2
         mov.l   r4,@-r2
+        mov     r1,r9
         mov.l   @(OFF_R0,r15),r0
         mov.l   @(OFF_R1,r15),r1
         mov.l   @(OFF_R2,r15),r2
         mov.l   @(OFF_R3,r15),r3
 2:
-        mov     #OFF_TRA,r8
-        add     r15,r8
-        mov.l   @r8,r9  
         mov     #64,r8
         cmp/hs  r8,r9
         bt      interrupt_entry ! vec >= 64 is interrupt
@@ -150,26 +148,14 @@ ENTRY(exception_handler)
         cmp/hs  r8,r9
         bt      trap_entry      ! 64 > vec >= 32  is trap
 
-#if defined(CONFIG_SH_FPU)
-        mov     #13,r8
-        cmp/eq  r8,r9
-        bt      10f             ! fpu
-        nop
-#endif
-
         mov.l   4f,r8
         mov     r9,r4
         shll2   r9
         add     r9,r8
-        mov.l   @r8,r8
-        mov     #0,r9
-        cmp/eq  r9,r8
+        mov.l   @r8,r8          ! exception handler address
+        tst     r8,r8
         bf      3f
         mov.l   8f,r8           ! unhandled exception
-#if defined(CONFIG_SH_FPU)
-10:
-        mov.l   9f, r8          ! unhandled exception
-#endif
 3:
         mov.l   5f,r10
         jmp     @r8
@@ -188,10 +174,7 @@ interrupt_entry:
 5:      .long   ret_from_exception
 6:      .long   ret_from_irq
 7:      .long   do_IRQ
-8:      .long   do_exception_error
-#ifdef CONFIG_SH_FPU
-9:      .long   fpu_error_trap_handler
-#endif
+8:      .long   exception_error
 
 trap_entry:
         mov     #0x30,r8
@@ -200,24 +183,9 @@ trap_entry:
         add     #-0x10,r9       ! convert SH2 to SH3/4 ABI
 1:      
         shll2   r9                      ! TRA
-        mov     #OFF_TRA,r8
-        add     r15,r8
-        mov.l   r9,@r8
-        mov     r9,r8
-#ifdef CONFIG_TRACE_IRQFLAGS
-        mov.l   2f, r9
-        jsr     @r9
-         nop
-#endif
-        sti
-        bra     system_call
-         nop
+        bra     system_call     ! jump common systemcall entry
+         mov    r9,r8
         
-        .align  2
-#ifdef CONFIG_TRACE_IRQFLAGS
-2:      .long   trace_hardirqs_on
-#endif
-
 #if defined(CONFIG_SH_STANDARD_BIOS)
         /* Unwind the stack and jmp to the debug entry */
 ENTRY(sh_bios_handler)
@@ -240,7 +208,7 @@ ENTRY(sh_bios_handler)
         mov.l   @r2,r2
         stc     sr,r3
         mov.l   r2,@r0
-        mov.l   r3,@r0
+        mov.l   r3,@(4,r0)
         mov.l   r1,@(8,r0)      
         mov.l   @r15+, r0
         mov.l   @r15+, r1
@@ -272,22 +240,30 @@ ENTRY(address_error_trap_handler)
         mov.l   1f,r0
         jmp     @r0
          mov    #0,r5                           ! writeaccess is unknown
-        .align  2
 
+        .align  2
 1:      .long   do_address_error
 
 restore_all:
-        cli
-#ifdef CONFIG_TRACE_IRQFLAGS
-        mov.l   1f, r0
-        jsr     @r0
-         nop
-#endif
+        stc     sr,r0
+        or      #0xf0,r0
+        ldc     r0,sr                           ! all interrupt block (same BL = 1)
+        ! restore special register
+        ! overlap exception frame
+        mov     r15,r0
+        add     #17*4,r0
+        lds.l   @r0+,pr
+        add     #4,r0
+        ldc.l   @r0+,gbr
+        lds.l   @r0+,mach
+        lds.l   @r0+,macl
         mov     r15,r0
         mov.l   $cpu_mode,r2
         mov     #OFF_SR,r3
         mov.l   @(r0,r3),r1
-        mov.l   r1,@r2
+        mov.l   __md_bit,r3
+        and     r1,r3                           ! copy MD bit
+        mov.l   r3,@r2
         shll2   r1                              ! clear MD bit
         shlr2   r1
         mov.l   @(OFF_SP,r0),r2
@@ -297,12 +273,6 @@ restore_all:
         mov     #OFF_PC,r3
         mov.l   @(r0,r3),r1
         mov.l   r1,@r2                          ! set pc
-        add     #4*16+4,r0
-        lds.l   @r0+,pr
-        add     #4,r0                           ! skip sr
-        ldc.l   @r0+,gbr
-        lds.l   @r0+,mach
-        lds.l   @r0+,macl
         get_current_thread_info r0, r1
         mov.l   $current_thread_info,r1
         mov.l   r0,@r1
@@ -326,9 +296,8 @@ restore_all:
          nop
 
         .align 2
-#ifdef CONFIG_TRACE_IRQFLAGS
-1:     .long   trace_hardirqs_off
-#endif
+__md_bit:
+        .long   0x40000000
 $current_thread_info:
         .long   __current_thread_info
 $cpu_mode:      
diff --git a/arch/sh/kernel/cpu/sh2/ex.S b/arch/sh/kernel/cpu/sh2/ex.S
index 6d285af7846c..85b0bf81fc1d 100644
--- a/arch/sh/kernel/cpu/sh2/ex.S
+++ b/arch/sh/kernel/cpu/sh2/ex.S
@@ -18,16 +18,17 @@
 exception_entry:        
 no      =       0
         .rept   256
-        mov.l   r0,@-sp
-        mov     #no,r0
+        mov.l   r1,@-sp
         bra     exception_trampoline
-        and     #0xff,r0
+        mov     #no,r1
 no      =       no + 1
         .endr
 exception_trampoline:
-        mov.l   r1,@-sp
-        mov.l   $exception_handler,r1
-        jmp     @r1
+        mov.l   r0,@-sp
+        mov.l   $exception_handler,r0
+        extu.b  r1,r1
+        jmp     @r0
+          extu.w        r1,r1
 
         .align  2
 $exception_entry:
@@ -41,6 +42,6 @@ $exception_handler:
 ENTRY(vbr_base)
 vector  =       0
         .rept   256
-        .long   exception_entry + vector * 8
+        .long   exception_entry + vector * 6
 vector  =       vector + 1
         .endr
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index cc530f4d84d6..56e5878e5516 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -96,8 +96,32 @@ static struct platform_device sci_device = {
         },
 };
 
+static struct resource eth_resources[] = {
+        [0] = {
+                .start = 0xfb000000,
+                .end =   0xfb0001c8,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = 85,
+                .end = 85,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device eth_device = {
+        .name = "sh-eth",
+        .id     = -1,
+        .dev = {
+                .platform_data = (void *)1,
+        },
+        .num_resources = ARRAY_SIZE(eth_resources),
+        .resource = eth_resources,
+};
+
 static struct platform_device *sh7619_devices[] __initdata = {
         &sci_device,
+        &eth_device,
 };
 
 static int __init sh7619_devices_setup(void)
diff --git a/arch/sh/kernel/cpu/sh2a/Makefile b/arch/sh/kernel/cpu/sh2a/Makefile
index 7e2b90cfa7bf..1ab1ecf4c768 100644
--- a/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@ -4,7 +4,7 @@
 
 obj-y   := common.o probe.o opcode_helper.o
 
-common-y        += $(addprefix ../sh2/, ex.o entry.o)
+common-y        += ex.o entry.o
 
 obj-$(CONFIG_SH_FPU)    += fpu.o
 
diff --git a/arch/sh/kernel/cpu/sh2a/entry.S b/arch/sh/kernel/cpu/sh2a/entry.S
new file mode 100644
index 000000000000..47096dc3d206
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/entry.S
@@ -0,0 +1,249 @@
+/*
+ * arch/sh/kernel/cpu/sh2a/entry.S
+ *
+ * The SH-2A exception entry
+ *
+ * Copyright (C) 2008 Yoshinori Sato
+ * Based on arch/sh/kernel/cpu/sh2/entry.S
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#include <asm/cpu/mmu_context.h>
+#include <asm/unistd.h>
+#include <asm/errno.h>
+#include <asm/page.h>
+        
+/* Offsets to the stack */
+OFF_R0  =  0            /* Return value. New ABI also arg4 */
+OFF_R1  =  4            /* New ABI: arg5 */
+OFF_R2  =  8            /* New ABI: arg6 */
+OFF_R3  =  12           /* New ABI: syscall_nr */
+OFF_R4  =  16           /* New ABI: arg0 */
+OFF_R5  =  20           /* New ABI: arg1 */
+OFF_R6  =  24           /* New ABI: arg2 */
+OFF_R7  =  28           /* New ABI: arg3 */
+OFF_SP  =  (15*4)
+OFF_PC  =  (16*4)
+OFF_SR  =  (16*4+2*4)
+OFF_TRA =  (16*4+6*4)
+
+#include <asm/entry-macros.S>
+
+ENTRY(exception_handler)
+        ! stack
+        ! r0 <- point sp
+        ! r1
+        ! pc
+        ! sr
+        ! r0 = temporary
+        ! r1 = vector (pseudo EXPEVT / INTEVT / TRA)
+        mov.l   r2,@-sp
+        cli
+        mov.l   $cpu_mode,r2
+        bld.b   #6,@(0,r2)      !previus SR.MD
+        bst.b   #6,@(4*4,r15)   !set cpu mode to SR.MD
+        bt      1f
+        ! switch to kernel mode
+        bset.b  #6,@(0,r2)      !set SR.MD
+        mov.l   $current_thread_info,r2
+        mov.l   @r2,r2
+        mov     #(THREAD_SIZE >> 8),r0
+        shll8   r0
+        add     r2,r0           ! r0 = kernel stack tail
+        mov     r15,r2          ! r2 = user stack top
+        mov     r0,r15          ! switch kernel stack
+        mov.l   r1,@-r15        ! TRA
+        sts.l   macl, @-r15
+        sts.l   mach, @-r15
+        stc.l   gbr, @-r15
+        mov.l   @(4*4,r2),r0
+        mov.l   r0,@-r15        ! original SR
+        sts.l   pr,@-r15
+        mov.l   @(3*4,r2),r0
+        mov.l   r0,@-r15        ! original PC
+        mov     r2,r0
+        add     #(3+2)*4,r0     ! rewind r0 - r3 + exception frame
+        lds     r0,pr           ! pr = original SP
+        movmu.l r3,@-r15        ! save regs
+        mov     r2,r8           ! r8 =  previus stack top
+        mov     r1,r9           ! r9 = interrupt vector
+        ! restore previous stack
+        mov.l   @r8+,r2
+        mov.l   @r8+,r0
+        mov.l   @r8+,r1
+        bra     2f
+         movml.l r2,@-r15
+1:
+        ! in kernel exception
+        mov     r15,r2
+        add     #-((OFF_TRA + 4) - OFF_PC) + 5*4,r15
+        movmu.l r3,@-r15
+        mov     r2,r8           ! r8 = previous stack top
+        mov     r1,r9           ! r9 = interrupt vector
+        ! restore exception frame & regs
+        mov.l   @r8+,r2         ! old R2
+        mov.l   @r8+,r0         ! old R0
+        mov.l   @r8+,r1         ! old R1
+        mov.l   @r8+,r10        ! old PC
+        mov.l   @r8+,r11        ! old SR
+        movml.l r2,@-r15
+        mov.l   r10,@(OFF_PC,r15)
+        mov.l   r11,@(OFF_SR,r15)
+        mov.l   r8,@(OFF_SP,r15)        ! save old sp
+        mov     r15,r8
+        add     #OFF_TRA + 4,r8
+        mov.l   r9,@-r8
+        sts.l   macl,@-r8
+        sts.l   mach,@-r8
+        stc.l   gbr,@-r8
+        add     #-4,r8
+        sts.l   pr,@-r8
+2:
+        ! dispatch exception / interrupt
+        mov     #64,r8
+        cmp/hs  r8,r9
+        bt      interrupt_entry ! vec >= 64 is interrupt
+        mov     #32,r8
+        cmp/hs  r8,r9
+        bt      trap_entry      ! 64 > vec >= 32  is trap
+
+        mov.l   4f,r8
+        mov     r9,r4
+        shll2   r9
+        add     r9,r8
+        mov.l   @r8,r8          ! exception handler address
+        tst     r8,r8
+        bf      3f
+        mov.l   8f,r8           ! unhandled exception
+3:
+        mov.l   5f,r10
+        jmp     @r8
+         lds    r10,pr
+
+interrupt_entry:
+        mov     r9,r4
+        mov     r15,r5
+        mov.l   7f,r8
+        mov.l   6f,r9
+        jmp     @r8
+         lds    r9,pr
+
+        .align  2
+4:      .long   exception_handling_table
+5:      .long   ret_from_exception
+6:      .long   ret_from_irq
+7:      .long   do_IRQ
+8:      .long   exception_error
+
+trap_entry:
+        mov     #0x30,r8
+        cmp/ge  r8,r9           ! vector 0x20-0x2f is systemcall
+        bt      1f
+        add     #-0x10,r9       ! convert SH2 to SH3/4 ABI
+1:      
+        shll2   r9                      ! TRA
+        bra     system_call     ! jump common systemcall entry
+         mov    r9,r8
+        
+#if defined(CONFIG_SH_STANDARD_BIOS)
+        /* Unwind the stack and jmp to the debug entry */
+ENTRY(sh_bios_handler)
+        mov     r15,r0
+        add     #(22-4)*4-4,r0
+        ldc.l   @r0+,gbr
+        lds.l   @r0+,mach
+        lds.l   @r0+,macl
+        mov     r15,r0
+        mov.l   @(OFF_SP,r0),r1
+        mov.l   @(OFF_SR,r2),r3
+        mov.l   r3,@-r1
+        mov.l   @(OFF_SP,r2),r3
+        mov.l   r3,@-r1
+        mov     r15,r0
+        add     #(22-4)*4-8,r0
+        mov.l   1f,r2
+        mov.l   @r2,r2
+        stc     sr,r3
+        mov.l   r2,@r0
+        mov.l   r3,@(4,r0)
+        mov.l   r1,@(8,r0)
+        movml.l @r15+,r14
+        add     #8,r15
+        lds.l   @r15+, pr
+        rte
+         mov.l  @r15+,r15
+        .align  2
+1:      .long   gdb_vbr_vector
+#endif /* CONFIG_SH_STANDARD_BIOS */
+
+ENTRY(address_error_trap_handler)
+        mov     r15,r4                          ! regs
+        mov.l   @(OFF_PC,r15),r6                ! pc
+        mov.l   1f,r0
+        jmp     @r0
+         mov    #0,r5                           ! writeaccess is unknown
+
+        .align  2
+1:      .long   do_address_error
+
+restore_all:
+        stc     sr,r0
+        or      #0xf0,r0
+        ldc     r0,sr                           ! all interrupt block (same BL = 1)
+        ! restore special register
+        ! overlap exception frame
+        mov     r15,r0
+        add     #17*4,r0
+        lds.l   @r0+,pr
+        add     #4,r0
+        ldc.l   @r0+,gbr
+        lds.l   @r0+,mach
+        lds.l   @r0+,macl
+        mov     r15,r0
+        mov.l   $cpu_mode,r2
+        bld.b   #6,@(OFF_SR,r15)
+        bst.b   #6,@(0,r2)                      ! save CPU mode
+        mov.l   @(OFF_SR,r0),r1
+        shll2   r1
+        shlr2   r1                              ! clear MD bit
+        mov.l   @(OFF_SP,r0),r2
+        add     #-8,r2
+        mov.l   r2,@(OFF_SP,r0)                 ! point exception frame top
+        mov.l   r1,@(4,r2)                      ! set sr
+        mov.l   @(OFF_PC,r0),r1
+        mov.l   r1,@r2                          ! set pc
+        get_current_thread_info r0, r1
+        mov.l   $current_thread_info,r1
+        mov.l   r0,@r1
+        movml.l @r15+,r14
+        mov.l   @r15,r15
+        rte
+         nop
+
+        .align 2
+$current_thread_info:
+        .long   __current_thread_info
+$cpu_mode:      
+        .long   __cpu_mode
+                
+! common exception handler
+#include "../../entry-common.S"
+        
+        .data
+! cpu operation mode 
+! bit30 = MD (compatible SH3/4)
+__cpu_mode:
+        .long   0x40000000
+                
+        .section        .bss
+__current_thread_info:
+        .long   0
+
+ENTRY(exception_handling_table)
+        .space  4*32
diff --git a/arch/sh/kernel/cpu/sh2a/ex.S b/arch/sh/kernel/cpu/sh2a/ex.S
new file mode 100644
index 000000000000..3ead9e63965a
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/ex.S
@@ -0,0 +1,72 @@
+/*
+ * arch/sh/kernel/cpu/sh2a/ex.S
+ *
+ * The SH-2A exception vector table
+ *
+ * Copyright (C) 2008 Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/linkage.h>
+
+!
+! convert Exception Vector to Exception Number
+!
+
+! exception no 0 to 255
+exception_entry0:
+no      =       0
+        .rept   256
+        mov.l   r1,@-sp
+        bra     exception_trampoline0
+        mov     #no,r1
+no      =       no + 1
+        .endr
+exception_trampoline0:
+        mov.l   r0,@-sp
+        mov.l   1f,r0
+        extu.b  r1,r1
+        jmp     @r0
+          extu.w        r1,r1
+         
+        .align  2
+1:      .long   exception_handler
+
+! exception no 256 to 511
+exception_entry1:
+no      =       0
+        .rept   256
+        mov.l   r1,@-sp
+        bra     exception_trampoline1
+        mov     #no,r1
+no      =       no + 1
+        .endr
+exception_trampoline1:
+        mov.l   r0,@-sp
+        extu.b  r1,r1
+        movi20  #0x100,r0
+        add     r0,r1
+        mov.l   1f,r0
+        jmp     @r0
+          extu.w        r1,r1
+        
+        .align  2
+1:      .long   exception_handler
+
+        !
+! Exception Vector Base
+!
+        .align  2
+ENTRY(vbr_base)
+vector  =       0
+        .rept   256
+        .long   exception_entry0 + vector * 6
+vector  =       vector + 1
+        .endr
+        .rept   256
+        .long   exception_entry1 + vector * 6
+vector  =       vector + 1
+        .endr
diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S
index 11b6d9c6edae..dac429726899 100644
--- a/arch/sh/kernel/cpu/sh3/ex.S
+++ b/arch/sh/kernel/cpu/sh3/ex.S
@@ -4,7 +4,7 @@
  *  The SH-3 and SH-4 exception vector table.
 
  *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka
- *  Copyright (C) 2003 - 2006  Paul Mundt
+ *  Copyright (C) 2003 - 2008  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -12,13 +12,30 @@
  */
 #include <linux/linkage.h>
 
+#if !defined(CONFIG_MMU)
+#define tlb_miss_load                   exception_error
+#define tlb_miss_store                  exception_error
+#define initial_page_write              exception_error
+#define tlb_protection_violation_load   exception_error
+#define tlb_protection_violation_store  exception_error
+#define address_error_load              exception_error
+#define address_error_store             exception_error
+#endif
+
+#if !defined(CONFIG_SH_FPU)
+#define fpu_error_trap_handler          exception_error
+#endif
+
+#if !defined(CONFIG_KGDB_NMI)
+#define kgdb_handle_exception           exception_error
+#endif
+
         .align 2
         .data
 
 ENTRY(exception_handling_table)
         .long   exception_error         /* 000 */
         .long   exception_error
-#if defined(CONFIG_MMU)
         .long   tlb_miss_load           /* 040 */
         .long   tlb_miss_store
         .long   initial_page_write
@@ -26,30 +43,13 @@ ENTRY(exception_handling_table)
         .long   tlb_protection_violation_store
         .long   address_error_load
         .long   address_error_store     /* 100 */
-#else
-        .long   exception_error ! tlb miss load         /* 040 */
-        .long   exception_error ! tlb miss store
-        .long   exception_error ! initial page write
-        .long   exception_error ! tlb prot violation load
-        .long   exception_error ! tlb prot violation store
-        .long   exception_error ! address error load
-        .long   exception_error ! address error store   /* 100 */
-#endif
-#if defined(CONFIG_SH_FPU)
         .long   fpu_error_trap_handler  /* 120 */
-#else
-        .long   exception_error         /* 120 */
-#endif
         .long   exception_error         /* 140 */
         .long   system_call     ! Unconditional Trap     /* 160 */
         .long   exception_error ! reserved_instruction (filled by trap_init) /* 180 */
         .long   exception_error ! illegal_slot_instruction (filled by trap_init) /*1A0*/
 ENTRY(nmi_slot)
-#if defined (CONFIG_KGDB_NMI)
         .long   kgdb_handle_exception   /* 1C0 */       ! Allow trap to debugger
-#else
-        .long   exception_none  /* 1C0 */       ! Not implemented yet
-#endif
 ENTRY(user_break_point_trap)
         .long   break_point_trap        /* 1E0 */
 
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index be4926969181..2e42572b1b11 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -50,14 +50,18 @@ int __init detect_cpu_and_cache_system(void)
         boot_cpu_data.dcache.ways               = 1;
         boot_cpu_data.dcache.linesz             = L1_CACHE_BYTES;
 
+        /* We don't know the chip cut */
+        boot_cpu_data.cut_major = boot_cpu_data.cut_minor = -1;
+
         /*
          * Setup some generic flags we can probe on SH-4A parts
          */
-        if (((pvr >> 24) & 0xff) == 0x10) {
+        if (((pvr >> 16) & 0xff) == 0x10) {
                 if ((cvr & 0x10000000) == 0)
                         boot_cpu_data.flags |= CPU_HAS_DSP;
 
                 boot_cpu_data.flags |= CPU_HAS_LLSC;
+                boot_cpu_data.cut_major = pvr & 0x7f;
         }
 
         /* FPU detection works for everyone */
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index a880e7968750..9381ad8da263 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -21,7 +21,7 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7763)	:= clock-sh7763.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7770)      := clock-sh7770.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7780)      := clock-sh7780.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7785)      := clock-sh7785.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7343)      := clock-sh7343.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7343)      := clock-sh7722.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7722)      := clock-sh7722.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7723)      := clock-sh7722.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7366)      := clock-sh7722.o
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
deleted file mode 100644
index 7adc4f16e95a..000000000000
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * arch/sh/kernel/cpu/sh4a/clock-sh7343.c
- *
- * SH7343/SH7722 support for the clock framework
- *
- *  Copyright (C) 2006  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <asm/clock.h>
-#include <asm/freq.h>
-
-/*
- * SH7343/SH7722 uses a common set of multipliers and divisors, so this
- * is quite simple..
- */
-static int multipliers[] = { 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-static int divisors[] = { 1, 3, 2, 5, 3, 4, 5, 6, 8, 10, 12, 16, 20 };
-
-#define pll_calc() (((ctrl_inl(FRQCR) >> 24) & 0x1f) + 1)
-
-static void master_clk_init(struct clk *clk)
-{
-        clk->parent = clk_get(NULL, "cpu_clk");
-}
-
-static void master_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) & 0x000f);
-        clk->rate *= clk->parent->rate * multipliers[idx] / divisors[idx];
-}
-
-static struct clk_ops sh7343_master_clk_ops = {
-        .init           = master_clk_init,
-        .recalc         = master_clk_recalc,
-};
-
-static void module_clk_init(struct clk *clk)
-{
-        clk->parent = NULL;
-        clk->rate = CONFIG_SH_PCLK_FREQ;
-}
-
-static struct clk_ops sh7343_module_clk_ops = {
-        .init           = module_clk_init,
-};
-
-static void bus_clk_init(struct clk *clk)
-{
-        clk->parent = clk_get(NULL, "cpu_clk");
-}
-
-static void bus_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) >> 8) & 0x000f;
-        clk->rate = clk->parent->rate * multipliers[idx] / divisors[idx];
-}
-
-static struct clk_ops sh7343_bus_clk_ops = {
-        .init           = bus_clk_init,
-        .recalc         = bus_clk_recalc,
-};
-
-static void cpu_clk_init(struct clk *clk)
-{
-        clk->parent = clk_get(NULL, "module_clk");
-        clk->flags |= CLK_RATE_PROPAGATES;
-        clk_set_rate(clk, clk_get_rate(clk));
-}
-
-static void cpu_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) >> 20) & 0x000f;
-        clk->rate = clk->parent->rate * pll_calc() *
-                multipliers[idx] / divisors[idx];
-}
-
-static struct clk_ops sh7343_cpu_clk_ops = {
-        .init           = cpu_clk_init,
-        .recalc         = cpu_clk_recalc,
-};
-
-static struct clk_ops *sh7343_clk_ops[] = {
-        &sh7343_master_clk_ops,
-        &sh7343_module_clk_ops,
-        &sh7343_bus_clk_ops,
-        &sh7343_cpu_clk_ops,
-};
-
-void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
-{
-        if (idx < ARRAY_SIZE(sh7343_clk_ops))
-                *ops = sh7343_clk_ops[idx];
-}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index 299138ebe160..db913855c2fd 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -1,7 +1,7 @@
 /*
  * arch/sh/kernel/cpu/sh4a/clock-sh7722.c
  *
- * SH7722 & SH7366 support for the clock framework
+ * SH7343, SH7722, SH7723 & SH7366 support for the clock framework
  *
  * Copyright (c) 2006-2007 Nomad Global Solutions Inc
  * Based on code for sh7343 by Paul Mundt
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/errno.h>
+#include <linux/stringify.h>
 #include <asm/clock.h>
 #include <asm/freq.h>
 
@@ -411,40 +412,40 @@ static struct clk_ops sh7722_frqcr_clk_ops = {
  * clock ops methods for SIU A/B and IrDA clock
  *
  */
-static int sh7722_siu_which(struct clk *clk)
+
+#ifndef CONFIG_CPU_SUBTYPE_SH7343
+
+static int sh7722_siu_set_rate(struct clk *clk, unsigned long rate, int algo_id)
 {
-        if (!strcmp(clk->name, "siu_a_clk"))
-                return 0;
-        if (!strcmp(clk->name, "siu_b_clk"))
-                return 1;
-#if defined(CONFIG_CPU_SUBTYPE_SH7722)
-        if (!strcmp(clk->name, "irda_clk"))
-                return 2;
-#endif
-        return -EINVAL;
+        unsigned long r;
+        int div;
+
+        r = ctrl_inl(clk->arch_flags);
+        div = sh7722_find_divisors(clk->parent->rate, rate);
+        if (div < 0)
+                return div;
+        r = (r & ~0xF) | div;
+        ctrl_outl(r, clk->arch_flags);
+        return 0;
 }
 
-static unsigned long sh7722_siu_regs[] = {
-        [0] = SCLKACR,
-        [1] = SCLKBCR,
-#if defined(CONFIG_CPU_SUBTYPE_SH7722)
-        [2] = IrDACLKCR,
-#endif
-};
+static void sh7722_siu_recalc(struct clk *clk)
+{
+        unsigned long r;
+
+        r = ctrl_inl(clk->arch_flags);
+        clk->rate = clk->parent->rate * 2 / divisors2[r & 0xF];
+}
 
 static int sh7722_siu_start_stop(struct clk *clk, int enable)
 {
-        int siu = sh7722_siu_which(clk);
         unsigned long r;
 
-        if (siu < 0)
-                return siu;
-        BUG_ON(siu > 2);
-        r = ctrl_inl(sh7722_siu_regs[siu]);
+        r = ctrl_inl(clk->arch_flags);
         if (enable)
-                ctrl_outl(r & ~(1 << 8), sh7722_siu_regs[siu]);
+                ctrl_outl(r & ~(1 << 8), clk->arch_flags);
         else
-                ctrl_outl(r | (1 << 8), sh7722_siu_regs[siu]);
+                ctrl_outl(r | (1 << 8), clk->arch_flags);
         return 0;
 }
 
@@ -458,6 +459,15 @@ static void sh7722_siu_disable(struct clk *clk)
         sh7722_siu_start_stop(clk, 0);
 }
 
+static struct clk_ops sh7722_siu_clk_ops = {
+        .recalc = sh7722_siu_recalc,
+        .set_rate = sh7722_siu_set_rate,
+        .enable = sh7722_siu_enable,
+        .disable = sh7722_siu_disable,
+};
+
+#endif /* CONFIG_CPU_SUBTYPE_SH7343 */
+
 static void sh7722_video_enable(struct clk *clk)
 {
         unsigned long r;
@@ -494,43 +504,6 @@ static void sh7722_video_recalc(struct clk *clk)
         clk->rate = clk->parent->rate / ((r & 0x3F) + 1);
 }
 
-static int sh7722_siu_set_rate(struct clk *clk, unsigned long rate, int algo_id)
-{
-        int siu = sh7722_siu_which(clk);
-        unsigned long r;
-        int div;
-
-        if (siu < 0)
-                return siu;
-        BUG_ON(siu > 2);
-        r = ctrl_inl(sh7722_siu_regs[siu]);
-        div = sh7722_find_divisors(clk->parent->rate, rate);
-        if (div < 0)
-                return div;
-        r = (r & ~0xF) | div;
-        ctrl_outl(r, sh7722_siu_regs[siu]);
-        return 0;
-}
-
-static void sh7722_siu_recalc(struct clk *clk)
-{
-        int siu = sh7722_siu_which(clk);
-        unsigned long r;
-
-        if (siu < 0)
-                return /* siu */ ;
-        BUG_ON(siu > 2);
-        r = ctrl_inl(sh7722_siu_regs[siu]);
-        clk->rate = clk->parent->rate * 2 / divisors2[r & 0xF];
-}
-
-static struct clk_ops sh7722_siu_clk_ops = {
-        .recalc = sh7722_siu_recalc,
-        .set_rate = sh7722_siu_set_rate,
-        .enable = sh7722_siu_enable,
-        .disable = sh7722_siu_disable,
-};
-
 static struct clk_ops sh7722_video_clk_ops = {
         .recalc = sh7722_video_recalc,
         .set_rate = sh7722_video_set_rate,
@@ -560,6 +533,9 @@ static struct clk sh7722_sdram_clock = {
         .ops = &sh7722_frqcr_clk_ops,
 };
 
+
+#ifndef CONFIG_CPU_SUBTYPE_SH7343
+
 /*
  * these three clocks - SIU A, SIU B, IrDA - share the same clk_ops
  * methods of clk_ops determine which register they should access by
@@ -567,36 +543,151 @@ static struct clk sh7722_sdram_clock = {
  */
 static struct clk sh7722_siu_a_clock = {
         .name = "siu_a_clk",
+        .arch_flags = SCLKACR,
         .ops = &sh7722_siu_clk_ops,
 };
 
 static struct clk sh7722_siu_b_clock = {
         .name = "siu_b_clk",
+        .arch_flags = SCLKBCR,
         .ops = &sh7722_siu_clk_ops,
 };
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7722)
 static struct clk sh7722_irda_clock = {
         .name = "irda_clk",
+        .arch_flags = IrDACLKCR,
         .ops = &sh7722_siu_clk_ops,
 };
 #endif
+#endif /* CONFIG_CPU_SUBTYPE_SH7343 */
 
 static struct clk sh7722_video_clock = {
         .name = "video_clk",
         .ops = &sh7722_video_clk_ops,
 };
 
+static int sh7722_mstpcr_start_stop(struct clk *clk, unsigned long reg,
+                                    int enable)
+{
+        unsigned long bit = clk->arch_flags;
+        unsigned long r;
+
+        r = ctrl_inl(reg);
+
+        if (enable)
+                r &= ~(1 << bit);
+        else
+                r |= (1 << bit);
+
+        ctrl_outl(r, reg);
+        return 0;
+}
+
+static void sh7722_mstpcr0_enable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR0, 1);
+}
+
+static void sh7722_mstpcr0_disable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR0, 0);
+}
+
+static void sh7722_mstpcr1_enable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR1, 1);
+}
+
+static void sh7722_mstpcr1_disable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR1, 0);
+}
+
+static void sh7722_mstpcr2_enable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR2, 1);
+}
+
+static void sh7722_mstpcr2_disable(struct clk *clk)
+{
+        sh7722_mstpcr_start_stop(clk, MSTPCR2, 0);
+}
+
+static struct clk_ops sh7722_mstpcr0_clk_ops = {
+        .enable = sh7722_mstpcr0_enable,
+        .disable = sh7722_mstpcr0_disable,
+};
+
+static struct clk_ops sh7722_mstpcr1_clk_ops = {
+        .enable = sh7722_mstpcr1_enable,
+        .disable = sh7722_mstpcr1_disable,
+};
+
+static struct clk_ops sh7722_mstpcr2_clk_ops = {
+        .enable = sh7722_mstpcr2_enable,
+        .disable = sh7722_mstpcr2_disable,
+};
+
+#define DECLARE_MSTPCRN(regnr, bitnr, bitstr)           \
+{                                                       \
+        .name = "mstp" __stringify(regnr) bitstr,       \
+        .arch_flags = bitnr,                            \
+        .ops = &sh7722_mstpcr ## regnr ## _clk_ops,     \
+}
+
+#define DECLARE_MSTPCR(regnr) \
+        DECLARE_MSTPCRN(regnr, 31, "31"), \
+        DECLARE_MSTPCRN(regnr, 30, "30"), \
+        DECLARE_MSTPCRN(regnr, 29, "29"), \
+        DECLARE_MSTPCRN(regnr, 28, "28"), \
+        DECLARE_MSTPCRN(regnr, 27, "27"), \
+        DECLARE_MSTPCRN(regnr, 26, "26"), \
+        DECLARE_MSTPCRN(regnr, 25, "25"), \
+        DECLARE_MSTPCRN(regnr, 24, "24"), \
+        DECLARE_MSTPCRN(regnr, 23, "23"), \
+        DECLARE_MSTPCRN(regnr, 22, "22"), \
+        DECLARE_MSTPCRN(regnr, 21, "21"), \
+        DECLARE_MSTPCRN(regnr, 20, "20"), \
+        DECLARE_MSTPCRN(regnr, 19, "19"), \
+        DECLARE_MSTPCRN(regnr, 18, "18"), \
+        DECLARE_MSTPCRN(regnr, 17, "17"), \
+        DECLARE_MSTPCRN(regnr, 16, "16"), \
+        DECLARE_MSTPCRN(regnr, 15, "15"), \
+        DECLARE_MSTPCRN(regnr, 14, "14"), \
+        DECLARE_MSTPCRN(regnr, 13, "13"), \
+        DECLARE_MSTPCRN(regnr, 12, "12"), \
+        DECLARE_MSTPCRN(regnr, 11, "11"), \
+        DECLARE_MSTPCRN(regnr, 10, "10"), \
+        DECLARE_MSTPCRN(regnr, 9, "09"), \
+        DECLARE_MSTPCRN(regnr, 8, "08"), \
+        DECLARE_MSTPCRN(regnr, 7, "07"), \
+        DECLARE_MSTPCRN(regnr, 6, "06"), \
+        DECLARE_MSTPCRN(regnr, 5, "05"), \
+        DECLARE_MSTPCRN(regnr, 4, "04"), \
+        DECLARE_MSTPCRN(regnr, 3, "03"), \
+        DECLARE_MSTPCRN(regnr, 2, "02"), \
+        DECLARE_MSTPCRN(regnr, 1, "01"), \
+        DECLARE_MSTPCRN(regnr, 0, "00")
+
+static struct clk sh7722_mstpcr[] = {
+        DECLARE_MSTPCR(0),
+        DECLARE_MSTPCR(1),
+        DECLARE_MSTPCR(2),
+};
+
 static struct clk *sh7722_clocks[] = {
         &sh7722_umem_clock,
         &sh7722_sh_clock,
         &sh7722_peripheral_clock,
         &sh7722_sdram_clock,
+#ifndef CONFIG_CPU_SUBTYPE_SH7343
         &sh7722_siu_a_clock,
         &sh7722_siu_b_clock,
 #if defined(CONFIG_CPU_SUBTYPE_SH7722)
         &sh7722_irda_clock,
 #endif
+#endif
         &sh7722_video_clock,
 };
 
@@ -629,5 +720,11 @@ int __init arch_clk_init(void)
                 clk_register(sh7722_clocks[i]);
         }
         clk_put(master);
+
+        for (i = 0; i < ARRAY_SIZE(sh7722_mstpcr); i++) {
+                pr_debug( "Registering mstpcr '%s'\n", sh7722_mstpcr[i].name);
+                clk_register(&sh7722_mstpcr[i]);
+        }
+
         return 0;
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 6d4f50cd4aaf..78881b4214da 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -11,6 +11,104 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
+#include <linux/uio_driver.h>
+#include <asm/clock.h>
+
+static struct resource iic0_resources[] = {
+        [0] = {
+                .name   = "IIC0",
+                .start  = 0x04470000,
+                .end    = 0x04470017,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 96,
+                .end    = 99,
+                .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device iic0_device = {
+        .name           = "i2c-sh_mobile",
+        .num_resources  = ARRAY_SIZE(iic0_resources),
+        .resource       = iic0_resources,
+};
+
+static struct resource iic1_resources[] = {
+        [0] = {
+                .name   = "IIC1",
+                .start  = 0x04750000,
+                .end    = 0x04750017,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 44,
+                .end    = 47,
+                .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device iic1_device = {
+        .name           = "i2c-sh_mobile",
+        .num_resources  = ARRAY_SIZE(iic1_resources),
+        .resource       = iic1_resources,
+};
+
+static struct uio_info vpu_platform_data = {
+        .name = "VPU4",
+        .version = "0",
+        .irq = 60,
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe9022eb,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+static struct uio_info veu_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 54,
+};
+
+static struct resource veu_resources[] = {
+        [0] = {
+                .name   = "VEU",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200b7,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu_platform_data,
+        },
+        .resource       = veu_resources,
+        .num_resources  = ARRAY_SIZE(veu_resources),
+};
 
 static struct plat_sci_port sci_platform_data[] = {
         {
@@ -32,16 +130,171 @@ static struct platform_device sci_device = {
 };
 
 static struct platform_device *sh7343_devices[] __initdata = {
+        &iic0_device,
+        &iic1_device,
         &sci_device,
+        &vpu_device,
+        &veu_device,
 };
 
 static int __init sh7343_devices_setup(void)
 {
+        clk_always_enable("mstp031"); /* TLB */
+        clk_always_enable("mstp030"); /* IC */
+        clk_always_enable("mstp029"); /* OC */
+        clk_always_enable("mstp028"); /* URAM */
+        clk_always_enable("mstp026"); /* XYMEM */
+        clk_always_enable("mstp023"); /* INTC3 */
+        clk_always_enable("mstp022"); /* INTC */
+        clk_always_enable("mstp020"); /* SuperHyway */
+        clk_always_enable("mstp109"); /* I2C0 */
+        clk_always_enable("mstp108"); /* I2C1 */
+        clk_always_enable("mstp202"); /* VEU */
+        clk_always_enable("mstp201"); /* VPU */
+
+        platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20);
+        platform_resource_setup_memory(&veu_device, "veu", 2 << 20);
+
         return platform_add_devices(sh7343_devices,
                                     ARRAY_SIZE(sh7343_devices));
 }
 __initcall(sh7343_devices_setup);
 
+enum {
+        UNUSED = 0,
+
+        /* interrupt sources */
+        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
+        DMAC0, DMAC1, DMAC2, DMAC3,
+        VIO_CEUI, VIO_BEUI, VIO_VEUI, VOU,
+        MFI, VPU, TPU, Z3D4, USBI0, USBI1,
+        MMC_ERR, MMC_TRAN, MMC_FSTAT, MMC_FRDY,
+        DMAC4, DMAC5, DMAC_DADERR,
+        KEYSC,
+        SCIF, SCIF1, SCIF2, SCIF3, SCIF4,
+        SIOF0, SIOF1, SIO,
+        FLCTL_FLSTEI, FLCTL_FLENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,
+        I2C0_ALI, I2C0_TACKI, I2C0_WAITI, I2C0_DTEI,
+        I2C1_ALI, I2C1_TACKI, I2C1_WAITI, I2C1_DTEI,
+        SIM_TEI, SIM_TXI, SIM_RXI, SIM_ERI,
+        IRDA,
+        SDHI0, SDHI1, SDHI2, SDHI3,
+        CMT, TSIF, SIU,
+        TMU0, TMU1, TMU2,
+        JPU, LCDC,
+
+        /* interrupt groups */
+
+        DMAC0123, VIOVOU, MMC, DMAC45, FLCTL, I2C0, I2C1, SIM, SDHI, USB,
+};
+
+static struct intc_vect vectors[] __initdata = {
+        INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),
+        INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660),
+        INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0),
+        INTC_VECT(IRQ6, 0x6c0), INTC_VECT(IRQ7, 0x6e0),
+        INTC_VECT(I2C1_ALI, 0x780), INTC_VECT(I2C1_TACKI, 0x7a0),
+        INTC_VECT(I2C1_WAITI, 0x7c0), INTC_VECT(I2C1_DTEI, 0x7e0),
+        INTC_VECT(DMAC0, 0x800), INTC_VECT(DMAC1, 0x820),
+        INTC_VECT(DMAC2, 0x840), INTC_VECT(DMAC3, 0x860),
+        INTC_VECT(VIO_CEUI, 0x880), INTC_VECT(VIO_BEUI, 0x8a0),
+        INTC_VECT(VIO_VEUI, 0x8c0), INTC_VECT(VOU, 0x8e0),
+        INTC_VECT(MFI, 0x900), INTC_VECT(VPU, 0x980),
+        INTC_VECT(TPU, 0x9a0), INTC_VECT(Z3D4, 0x9e0),
+        INTC_VECT(USBI0, 0xa20), INTC_VECT(USBI1, 0xa40),
+        INTC_VECT(MMC_ERR, 0xb00), INTC_VECT(MMC_TRAN, 0xb20),
+        INTC_VECT(MMC_FSTAT, 0xb40), INTC_VECT(MMC_FRDY, 0xb60),
+        INTC_VECT(DMAC4, 0xb80), INTC_VECT(DMAC5, 0xba0),
+        INTC_VECT(DMAC_DADERR, 0xbc0), INTC_VECT(KEYSC, 0xbe0),
+        INTC_VECT(SCIF, 0xc00), INTC_VECT(SCIF1, 0xc20),
+        INTC_VECT(SCIF2, 0xc40), INTC_VECT(SCIF3, 0xc60),
+        INTC_VECT(SIOF0, 0xc80), INTC_VECT(SIOF1, 0xca0),
+        INTC_VECT(SIO, 0xd00),
+        INTC_VECT(FLCTL_FLSTEI, 0xd80), INTC_VECT(FLCTL_FLENDI, 0xda0),
+        INTC_VECT(FLCTL_FLTREQ0I, 0xdc0), INTC_VECT(FLCTL_FLTREQ1I, 0xde0),
+        INTC_VECT(I2C0_ALI, 0xe00), INTC_VECT(I2C0_TACKI, 0xe20),
+        INTC_VECT(I2C0_WAITI, 0xe40), INTC_VECT(I2C0_DTEI, 0xe60),
+        INTC_VECT(SDHI0, 0xe80), INTC_VECT(SDHI1, 0xea0),
+        INTC_VECT(SDHI2, 0xec0), INTC_VECT(SDHI3, 0xee0),
+        INTC_VECT(CMT, 0xf00), INTC_VECT(TSIF, 0xf20),
+        INTC_VECT(SIU, 0xf80),
+        INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),
+        INTC_VECT(TMU2, 0x440),
+        INTC_VECT(JPU, 0x560), INTC_VECT(LCDC, 0x580),
+};
+
+static struct intc_group groups[] __initdata = {
+        INTC_GROUP(DMAC0123, DMAC0, DMAC1, DMAC2, DMAC3),
+        INTC_GROUP(VIOVOU, VIO_CEUI, VIO_BEUI, VIO_VEUI, VOU),
+        INTC_GROUP(MMC, MMC_FRDY, MMC_FSTAT, MMC_TRAN, MMC_ERR),
+        INTC_GROUP(DMAC45, DMAC4, DMAC5, DMAC_DADERR),
+        INTC_GROUP(FLCTL, FLCTL_FLSTEI, FLCTL_FLENDI,
+                   FLCTL_FLTREQ0I, FLCTL_FLTREQ1I),
+        INTC_GROUP(I2C0, I2C0_ALI, I2C0_TACKI, I2C0_WAITI, I2C0_DTEI),
+        INTC_GROUP(I2C1, I2C1_ALI, I2C1_TACKI, I2C1_WAITI, I2C1_DTEI),
+        INTC_GROUP(SIM, SIM_TEI, SIM_TXI, SIM_RXI, SIM_ERI),
+        INTC_GROUP(SDHI, SDHI0, SDHI1, SDHI2, SDHI3),
+        INTC_GROUP(USB, USBI0, USBI1),
+};
+
+static struct intc_mask_reg mask_registers[] __initdata = {
+        { 0xa4080084, 0xa40800c4, 8, /* IMR1 / IMCR1 */
+          { VOU, VIO_VEUI, VIO_BEUI, VIO_CEUI, DMAC3, DMAC2, DMAC1, DMAC0 } },
+        { 0xa4080088, 0xa40800c8, 8, /* IMR2 / IMCR2 */
+          { 0, 0, 0, VPU, 0, 0, 0, MFI } },
+        { 0xa408008c, 0xa40800cc, 8, /* IMR3 / IMCR3 */
+          { SIM_TEI, SIM_TXI, SIM_RXI, SIM_ERI, 0, 0, 0, IRDA } },
+        { 0xa4080090, 0xa40800d0, 8, /* IMR4 / IMCR4 */
+          { 0, TMU2, TMU1, TMU0, JPU, 0, 0, LCDC } },
+        { 0xa4080094, 0xa40800d4, 8, /* IMR5 / IMCR5 */
+          { KEYSC, DMAC_DADERR, DMAC5, DMAC4, SCIF3, SCIF2, SCIF1, SCIF } },
+        { 0xa4080098, 0xa40800d8, 8, /* IMR6 / IMCR6 */
+          { 0, 0, 0, SIO, Z3D4, 0, SIOF1, SIOF0 } },
+        { 0xa408009c, 0xa40800dc, 8, /* IMR7 / IMCR7 */
+          { I2C0_DTEI, I2C0_WAITI, I2C0_TACKI, I2C0_ALI,
+            FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } },
+        { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */
+          { SDHI3, SDHI2, SDHI1, SDHI0, 0, 0, 0, SIU } },
+        { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */
+          { 0, 0, 0, CMT, 0, USBI1, USBI0 } },
+        { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */
+          { MMC_FRDY, MMC_FSTAT, MMC_TRAN, MMC_ERR } },
+        { 0xa40800ac, 0xa40800ec, 8, /* IMR11 / IMCR11 */
+          { I2C1_DTEI, I2C1_WAITI, I2C1_TACKI, I2C1_ALI, TPU, 0, 0, TSIF } },
+        { 0xa4140044, 0xa4140064, 8, /* INTMSK00 / INTMSKCLR00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_prio_reg prio_registers[] __initdata = {
+        { 0xa4080000, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2 } },
+        { 0xa4080004, 0, 16, 4, /* IPRB */ { JPU, LCDC, SIM } },
+        { 0xa4080010, 0, 16, 4, /* IPRE */ { DMAC0123, VIOVOU, MFI, VPU } },
+        { 0xa4080014, 0, 16, 4, /* IPRF */ { KEYSC, DMAC45, USB, CMT } },
+        { 0xa4080018, 0, 16, 4, /* IPRG */ { SCIF, SCIF1, SCIF2, SCIF3 } },
+        { 0xa408001c, 0, 16, 4, /* IPRH */ { SIOF0, SIOF1, FLCTL, I2C0 } },
+        { 0xa4080020, 0, 16, 4, /* IPRI */ { SIO, 0, TSIF, I2C1 } },
+        { 0xa4080024, 0, 16, 4, /* IPRJ */ { Z3D4, 0, SIU } },
+        { 0xa4080028, 0, 16, 4, /* IPRK */ { 0, MMC, 0, SDHI } },
+        { 0xa408002c, 0, 16, 4, /* IPRL */ { 0, 0, TPU } },
+        { 0xa4140010, 0, 32, 4, /* INTPRI00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_sense_reg sense_registers[] __initdata = {
+        { 0xa414001c, 16, 2, /* ICR1 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_mask_reg ack_registers[] __initdata = {
+        { 0xa4140024, 0, 8, /* INTREQ00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_desc, "sh7343", vectors, groups,
+                             mask_registers, prio_registers, sense_registers,
+                             ack_registers);
+
 void __init plat_irq_setup(void)
 {
+        register_intc_controller(&intc_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index f26b5cdad0d1..6851dba02f31 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -13,6 +13,112 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
+#include <linux/uio_driver.h>
+#include <asm/clock.h>
+
+static struct resource iic_resources[] = {
+        [0] = {
+                .name   = "IIC",
+                .start  = 0x04470000,
+                .end    = 0x04470017,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 96,
+                .end    = 99,
+                .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device iic_device = {
+        .name           = "i2c-sh_mobile",
+        .num_resources  = ARRAY_SIZE(iic_resources),
+        .resource       = iic_resources,
+};
+
+static struct uio_info vpu_platform_data = {
+        .name = "VPU5",
+        .version = "0",
+        .irq = 60,
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe902807,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+static struct uio_info veu0_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 54,
+};
+
+static struct resource veu0_resources[] = {
+        [0] = {
+                .name   = "VEU(1)",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200b7,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu0_platform_data,
+        },
+        .resource       = veu0_resources,
+        .num_resources  = ARRAY_SIZE(veu0_resources),
+};
+
+static struct uio_info veu1_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 27,
+};
+
+static struct resource veu1_resources[] = {
+        [0] = {
+                .name   = "VEU(2)",
+                .start  = 0xfe924000,
+                .end    = 0xfe9240b7,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 2,
+        .dev = {
+                .platform_data  = &veu1_platform_data,
+        },
+        .resource       = veu1_resources,
+        .num_resources  = ARRAY_SIZE(veu1_resources),
+};
 
 static struct plat_sci_port sci_platform_data[] = {
         {
@@ -34,11 +140,32 @@ static struct platform_device sci_device = {
 };
 
 static struct platform_device *sh7366_devices[] __initdata = {
+        &iic_device,
         &sci_device,
+        &vpu_device,
+        &veu0_device,
+        &veu1_device,
 };
 
 static int __init sh7366_devices_setup(void)
 {
+        clk_always_enable("mstp031"); /* TLB */
+        clk_always_enable("mstp030"); /* IC */
+        clk_always_enable("mstp029"); /* OC */
+        clk_always_enable("mstp028"); /* RSMEM */
+        clk_always_enable("mstp026"); /* XYMEM */
+        clk_always_enable("mstp023"); /* INTC3 */
+        clk_always_enable("mstp022"); /* INTC */
+        clk_always_enable("mstp020"); /* SuperHyway */
+        clk_always_enable("mstp109"); /* I2C */
+        clk_always_enable("mstp207"); /* VEU-2 */
+        clk_always_enable("mstp202"); /* VEU-1 */
+        clk_always_enable("mstp201"); /* VPU */
+
+        platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
+        platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20);
+        platform_resource_setup_memory(&veu1_device, "veu1", 2 << 20);
+
         return platform_add_devices(sh7366_devices,
                                     ARRAY_SIZE(sh7366_devices));
 }
@@ -97,7 +224,7 @@ static struct intc_vect vectors[] __initdata = {
         INTC_VECT(SIU, 0xf80),
         INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),
         INTC_VECT(TMU2, 0x440),
-        INTC_VECT(VEU2, 0x580), INTC_VECT(LCDC, 0x580),
+        INTC_VECT(VEU2, 0x560), INTC_VECT(LCDC, 0x580),
 };
 
 static struct intc_group groups[] __initdata = {
@@ -163,8 +290,14 @@ static struct intc_sense_reg sense_registers[] __initdata = {
           { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7366", vectors, groups,
-                         mask_registers, prio_registers, sense_registers);
+static struct intc_mask_reg ack_registers[] __initdata = {
+        { 0xa4140024, 0, 8, /* INTREQ00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_desc, "sh7366", vectors, groups,
+                             mask_registers, prio_registers, sense_registers,
+                             ack_registers);
 
 void __init plat_irq_setup(void)
 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 62ebccf18b3c..de1ede92176e 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -12,6 +12,8 @@
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
 #include <linux/mm.h>
+#include <linux/uio_driver.h>
+#include <asm/clock.h>
 #include <asm/mmzone.h>
 
 static struct resource usbf_resources[] = {
@@ -59,6 +61,62 @@ static struct platform_device iic_device = {
         .resource       = iic_resources,
 };
 
+static struct uio_info vpu_platform_data = {
+        .name = "VPU4",
+        .version = "0",
+        .irq = 60,
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe9022eb,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+static struct uio_info veu_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 54,
+};
+
+static struct resource veu_resources[] = {
+        [0] = {
+                .name   = "VEU",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200b7,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu_platform_data,
+        },
+        .resource       = veu_resources,
+        .num_resources  = ARRAY_SIZE(veu_resources),
+};
+
 static struct plat_sci_port sci_platform_data[] = {
         {
                 .mapbase        = 0xffe00000,
@@ -95,10 +153,27 @@ static struct platform_device *sh7722_devices[] __initdata = {
         &usbf_device,
         &iic_device,
         &sci_device,
+        &vpu_device,
+        &veu_device,
 };
 
 static int __init sh7722_devices_setup(void)
 {
+        clk_always_enable("mstp031"); /* TLB */
+        clk_always_enable("mstp030"); /* IC */
+        clk_always_enable("mstp029"); /* OC */
+        clk_always_enable("mstp028"); /* URAM */
+        clk_always_enable("mstp026"); /* XYMEM */
+        clk_always_enable("mstp022"); /* INTC */
+        clk_always_enable("mstp020"); /* SuperHyway */
+        clk_always_enable("mstp109"); /* I2C */
+        clk_always_enable("mstp211"); /* USB */
+        clk_always_enable("mstp202"); /* VEU */
+        clk_always_enable("mstp201"); /* VPU */
+
+        platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20);
+        platform_resource_setup_memory(&veu_device, "veu", 2 << 20);
+
         return platform_add_devices(sh7722_devices,
                                     ARRAY_SIZE(sh7722_devices));
 }
@@ -229,8 +304,14 @@ static struct intc_sense_reg sense_registers[] __initdata = {
           { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups,
-                         mask_registers, prio_registers, sense_registers);
+static struct intc_mask_reg ack_registers[] __initdata = {
+        { 0xa4140024, 0, 8, /* INTREQ00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_desc, "sh7722", vectors, groups,
+                             mask_registers, prio_registers, sense_registers,
+                             ack_registers);
 
 void __init plat_irq_setup(void)
 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index a0470f2f5479..cd6baffdc896 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -12,8 +12,94 @@
 #include <linux/serial.h>
 #include <linux/mm.h>
 #include <linux/serial_sci.h>
+#include <linux/uio_driver.h>
+#include <asm/clock.h>
 #include <asm/mmzone.h>
 
+static struct uio_info vpu_platform_data = {
+        .name = "VPU5",
+        .version = "0",
+        .irq = 60,
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe902807,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+static struct uio_info veu0_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 54,
+};
+
+static struct resource veu0_resources[] = {
+        [0] = {
+                .name   = "VEU2H0",
+                .start  = 0xfe920000,
+                .end    = 0xfe92027b,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu0_platform_data,
+        },
+        .resource       = veu0_resources,
+        .num_resources  = ARRAY_SIZE(veu0_resources),
+};
+
+static struct uio_info veu1_platform_data = {
+        .name = "VEU",
+        .version = "0",
+        .irq = 27,
+};
+
+static struct resource veu1_resources[] = {
+        [0] = {
+                .name   = "VEU2H1",
+                .start  = 0xfe924000,
+                .end    = 0xfe92427b,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                /* place holder for contiguous memory */
+        },
+};
+
+static struct platform_device veu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 2,
+        .dev = {
+                .platform_data  = &veu1_platform_data,
+        },
+        .resource       = veu1_resources,
+        .num_resources  = ARRAY_SIZE(veu1_resources),
+};
+
 static struct plat_sci_port sci_platform_data[] = {
         {
                 .mapbase        = 0xffe00000,
@@ -113,14 +199,56 @@ static struct platform_device sh7723_usb_host_device = {
         .resource       = sh7723_usb_host_resources,
 };
 
+static struct resource iic_resources[] = {
+        [0] = {
+                .name   = "IIC",
+                .start  = 0x04470000,
+                .end    = 0x04470017,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 96,
+                .end    = 99,
+                .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device iic_device = {
+        .name           = "i2c-sh_mobile",
+        .num_resources  = ARRAY_SIZE(iic_resources),
+        .resource       = iic_resources,
+};
+
 static struct platform_device *sh7723_devices[] __initdata = {
         &sci_device,
         &rtc_device,
+        &iic_device,
         &sh7723_usb_host_device,
+        &vpu_device,
+        &veu0_device,
+        &veu1_device,
 };
 
 static int __init sh7723_devices_setup(void)
 {
+        clk_always_enable("mstp031"); /* TLB */
+        clk_always_enable("mstp030"); /* IC */
+        clk_always_enable("mstp029"); /* OC */
+        clk_always_enable("mstp024"); /* FPU */
+        clk_always_enable("mstp022"); /* INTC */
+        clk_always_enable("mstp020"); /* SuperHyway */
+        clk_always_enable("mstp000"); /* MERAM */
+        clk_always_enable("mstp109"); /* I2C */
+        clk_always_enable("mstp108"); /* RTC */
+        clk_always_enable("mstp211"); /* USB */
+        clk_always_enable("mstp206"); /* VEU2H1 */
+        clk_always_enable("mstp202"); /* VEU2H0 */
+        clk_always_enable("mstp201"); /* VPU */
+
+        platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
+        platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20);
+        platform_resource_setup_memory(&veu1_device, "veu1", 2 << 20);
+
         return platform_add_devices(sh7723_devices,
                                     ARRAY_SIZE(sh7723_devices));
 }
@@ -326,8 +454,14 @@ static struct intc_sense_reg sense_registers[] __initdata = {
           { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_desc, "sh7723", vectors, groups,
-                         mask_registers, prio_registers, sense_registers);
+static struct intc_mask_reg ack_registers[] __initdata = {
+        { 0xa4140024, 0, 8, /* INTREQ00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_desc, "sh7723", vectors, groups,
+                             mask_registers, prio_registers, sense_registers,
+                             ack_registers);
 
 void __init plat_irq_setup(void)
 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index f189a559462b..3c5b629887a8 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2006  Paul Mundt
  *  Copyright (C) 2007  Yoshihiro Shimoda
+ *  Copyright (C) 2008  Nobuhiro Iwamatsu
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -56,6 +57,11 @@ static struct plat_sci_port sci_platform_data[] = {
                 .type           = PORT_SCIF,
                 .irqs           = { 76, 77, 79, 78 },
         }, {
+                .mapbase        = 0xffe10000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 104, 105, 107, 106 },
+        }, {
                 .flags = 0,
         }
 };
@@ -208,8 +214,8 @@ static struct intc_vect vectors[] __initdata = {
         INTC_VECT(TMU5, 0xe40), INTC_VECT(ADC, 0xe60),
         INTC_VECT(SSI0, 0xe80), INTC_VECT(SSI1, 0xea0),
         INTC_VECT(SSI2, 0xec0), INTC_VECT(SSI3, 0xee0),
-        INTC_VECT(SCIF1_ERI, 0xf00), INTC_VECT(SCIF1_RXI, 0xf20),
-        INTC_VECT(SCIF1_BRI, 0xf40), INTC_VECT(SCIF1_TXI, 0xf60),
+        INTC_VECT(SCIF2_ERI, 0xf00), INTC_VECT(SCIF2_RXI, 0xf20),
+        INTC_VECT(SCIF2_BRI, 0xf40), INTC_VECT(SCIF2_TXI, 0xf60),
         INTC_VECT(GPIO_CH0, 0xf80), INTC_VECT(GPIO_CH1, 0xfa0),
         INTC_VECT(GPIO_CH2, 0xfc0), INTC_VECT(GPIO_CH3, 0xfe0),
 };
@@ -290,9 +296,14 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = {
                                             IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors,
-                        NULL, irq_mask_registers, irq_prio_registers,
-                        irq_sense_registers);
+static struct intc_mask_reg irq_ack_registers[] __initdata = {
+        { 0xffd00024, 0, 32, /* INTREQ */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_irq_desc, "sh7763-irq", irq_vectors,
+                             NULL, irq_mask_registers, irq_prio_registers,
+                             irq_sense_registers, irq_ack_registers);
 
 
 /* External interrupt pins in IRL mode */
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 18dbbe23fea1..fb8200cc7440 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -217,9 +217,14 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = {
                                             IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_irq_desc, "sh7780-irq", irq_vectors,
-                         NULL, irq_mask_registers, irq_prio_registers,
-                         irq_sense_registers);
+static struct intc_mask_reg irq_ack_registers[] __initdata = {
+        { 0xffd00024, 0, 32, /* INTREQ */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_irq_desc, "sh7780-irq", irq_vectors,
+                             NULL, irq_mask_registers, irq_prio_registers,
+                             irq_sense_registers, irq_ack_registers);
 
 /* External interrupt pins in IRL mode */
 
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 621e7329ec63..30baa63b24c8 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -238,13 +238,18 @@ static struct intc_sense_reg sense_registers[] __initdata = {
                                             IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC(intc_desc_irq0123, "sh7785-irq0123", vectors_irq0123,
-                         NULL, mask_registers, prio_registers,
-                         sense_registers);
+static struct intc_mask_reg ack_registers[] __initdata = {
+        { 0xffd00024, 0, 32, /* INTREQ */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC_ACK(intc_desc_irq0123, "sh7785-irq0123",
+                             vectors_irq0123, NULL, mask_registers,
+                             prio_registers, sense_registers, ack_registers);
 
-static DECLARE_INTC_DESC(intc_desc_irq4567, "sh7785-irq4567", vectors_irq4567,
-                         NULL, mask_registers, prio_registers,
-                         sense_registers);
+static DECLARE_INTC_DESC_ACK(intc_desc_irq4567, "sh7785-irq4567",
+                             vectors_irq4567, NULL, mask_registers,
+                             prio_registers, sense_registers, ack_registers);
 
 /* External interrupt pins in IRL mode */
 
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index 718bd2356b34..5e0dd1933847 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -192,7 +192,7 @@ work_resched:
         .align  2
 1:      .long   schedule
 2:      .long   do_notify_resume
-3:      .long   restore_all
+3:      .long   resume_userspace
 #ifdef CONFIG_TRACE_IRQFLAGS
 4:      .long   trace_hardirqs_on
 5:      .long   trace_hardirqs_off
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 921892c351da..3326a45749d9 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -34,18 +34,6 @@ void (*pm_idle)(void);
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-void disable_hlt(void)
-{
-        hlt_counter++;
-}
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-        hlt_counter--;
-}
-EXPORT_SYMBOL(enable_hlt);
-
 static int __init nohlt_setup(char *__unused)
 {
         hlt_counter = 1;
@@ -60,7 +48,7 @@ static int __init hlt_setup(char *__unused)
 }
 __setup("hlt", hlt_setup);
 
-void default_idle(void)
+static void default_idle(void)
 {
         if (!hlt_counter) {
                 clear_thread_flag(TIF_POLLING_NRFLAG);
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 0283d8133075..b9dbd2d3b4a5 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -36,16 +36,6 @@ static int hlt_counter = 1;
 
 #define HARD_IDLE_TIMEOUT (HZ / 3)
 
-void disable_hlt(void)
-{
-        hlt_counter++;
-}
-
-void enable_hlt(void)
-{
-        hlt_counter--;
-}
-
 static int __init nohlt_setup(char *__unused)
 {
         hlt_counter = 1;
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index fddb547f3c2b..2bc72def5cf8 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -241,6 +241,29 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 break;
         }
 #endif
+#ifdef CONFIG_BINFMT_ELF_FDPIC
+        case PTRACE_GETFDPIC: {
+                unsigned long tmp = 0;
+
+                switch (addr) {
+                case PTRACE_GETFDPIC_EXEC:
+                        tmp = child->mm->context.exec_fdpic_loadmap;
+                        break;
+                case PTRACE_GETFDPIC_INTERP:
+                        tmp = child->mm->context.interp_fdpic_loadmap;
+                        break;
+                default:
+                        break;
+                }
+
+                ret = 0;
+                if (put_user(tmp, (unsigned long *) data)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                break;
+        }
+#endif
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index bca2bbc575db..6339d0c95715 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -398,6 +398,7 @@ const char *get_cpu_subtype(struct sh_cpuinfo *c)
 {
         return cpu_name[c->type];
 }
+EXPORT_SYMBOL(get_cpu_subtype);
 
 #ifdef CONFIG_PROC_FS
 /* Symbolic CPU flags, keep in sync with asm/cpu-features.h */
@@ -452,6 +453,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "processor\t: %d\n", cpu);
         seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
         seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c));
+        if (c->cut_major == -1)
+                seq_printf(m, "cut\t\t: unknown\n");
+        else if (c->cut_minor == -1)
+                seq_printf(m, "cut\t\t: %d.x\n", c->cut_major);
+        else
+                seq_printf(m, "cut\t\t: %d.%d\n", c->cut_major, c->cut_minor);
 
         show_cpuflags(m, c);
 
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index f311551d9a05..4bbbde895a53 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -33,6 +33,11 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+struct fdpic_func_descriptor {
+        unsigned long   text;
+        unsigned long   GOT;
+};
+
 /*
  * Atomically swap in the new signal mask, and wait for a signal.
  */
@@ -368,6 +373,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                 err |= __put_user(OR_R0_R0, &frame->retcode[6]);
                 err |= __put_user((__NR_sigreturn), &frame->retcode[7]);
                 regs->pr = (unsigned long) frame->retcode;
+                flush_icache_range(regs->pr, regs->pr + sizeof(frame->retcode));
         }
 
         if (err)
@@ -378,18 +384,21 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         regs->regs[4] = signal; /* Arg for signal handler */
         regs->regs[5] = 0;
         regs->regs[6] = (unsigned long) &frame->sc;
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+
+        if (current->personality & FDPIC_FUNCPTRS) {
+                struct fdpic_func_descriptor __user *funcptr =
+                        (struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
+
+                __get_user(regs->pc, &funcptr->text);
+                __get_user(regs->regs[12], &funcptr->GOT);
+        } else
+                regs->pc = (unsigned long)ka->sa.sa_handler;
 
         set_fs(USER_DS);
 
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
                  current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
-        flush_cache_sigtramp(regs->pr);
-
-        if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode))
-                flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES);
-
         return 0;
 
 give_sigsegv:
@@ -458,17 +467,22 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->regs[4] = signal; /* Arg for signal handler */
         regs->regs[5] = (unsigned long) &frame->info;
         regs->regs[6] = (unsigned long) &frame->uc;
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+
+        if (current->personality & FDPIC_FUNCPTRS) {
+                struct fdpic_func_descriptor __user *funcptr =
+                        (struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
+
+                __get_user(regs->pc, &funcptr->text);
+                __get_user(regs->regs[12], &funcptr->GOT);
+        } else
+                regs->pc = (unsigned long)ka->sa.sa_handler;
 
         set_fs(USER_DS);
 
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
                  current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
-        flush_cache_sigtramp(regs->pr);
-
-        if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode))
-                flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES);
+        flush_icache_range(regs->pr, regs->pr + sizeof(frame->retcode));
 
         return 0;
 
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index a46cc3a41148..0af693e65764 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -343,3 +343,9 @@ ENTRY(sys_call_table)
         .long sys_fallocate
         .long sys_timerfd_settime       /* 325 */
         .long sys_timerfd_gettime
+        .long sys_signalfd4
+        .long sys_eventfd2
+        .long sys_epoll_create1
+        .long sys_dup3                  /* 330 */
+        .long sys_pipe2
+        .long sys_inotify_init1
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index d5d7843aad94..0b436aa3cad7 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -381,3 +381,9 @@ sys_call_table:
         .long sys_fallocate
         .long sys_timerfd_settime
         .long sys_timerfd_gettime
+        .long sys_signalfd4             /* 355 */
+        .long sys_eventfd2
+        .long sys_epoll_create1
+        .long sys_dup3
+        .long sys_pipe2
+        .long sys_inotify_init1         /* 360 */
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index 7281342c044d..0758b5ee8180 100644
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -211,7 +211,7 @@ unsigned long sh_hpt_frequency = 0;
 
 #define NSEC_PER_CYC_SHIFT      10
 
-struct clocksource clocksource_sh = {
+static struct clocksource clocksource_sh = {
         .name           = "SuperH",
         .rating         = 200,
         .mask           = CLOCKSOURCE_MASK(32),
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 8935570008d2..1ca9ad49b541 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -209,7 +209,7 @@ static int tmu_timer_init(void)
         return 0;
 }
 
-struct sys_timer_ops tmu_timer_ops = {
+static struct sys_timer_ops tmu_timer_ops = {
         .init           = tmu_timer_init,
         .start          = tmu_timer_start,
         .stop           = tmu_timer_stop,
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index e08b3bfeb656..511a9426cec5 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -43,6 +43,7 @@
 # define TRAP_ILLEGAL_SLOT_INST 6
 # define TRAP_ADDRESS_ERROR     9
 # ifdef CONFIG_CPU_SH2A
+#  define TRAP_FPU_ERROR        13
 #  define TRAP_DIVZERO_ERROR    17
 #  define TRAP_DIVOVF_ERROR     18
 # endif
@@ -851,6 +852,9 @@ void __init trap_init(void)
 #ifdef CONFIG_CPU_SH2A
         set_exception_table_vec(TRAP_DIVZERO_ERROR, do_divide_error);
         set_exception_table_vec(TRAP_DIVOVF_ERROR, do_divide_error);
+#ifdef CONFIG_SH_FPU
+        set_exception_table_vec(TRAP_FPU_ERROR, fpu_error_trap_handler);
+#endif
 #endif
 
         /* Setup VBR for boot cpu */
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index ebb55d1149f5..8596cc78e18d 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -2,9 +2,11 @@
 # Makefile for SuperH-specific library files..
 #
 
-lib-y  = delay.o io.o memset.o memmove.o memchr.o \
+lib-y  = delay.o memset.o memmove.o memchr.o \
          checksum.o strlen.o div64.o div64-generic.o
 
+obj-y                           += io.o
+
 memcpy-y                        := memcpy.o
 memcpy-$(CONFIG_CPU_SH4)        := memcpy-sh4.o
 
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 5fd218430b19..56d0a7daa34b 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -145,25 +145,39 @@ choice
 
 config PAGE_SIZE_4KB
         bool "4kB"
-        depends on !X2TLB
+        depends on !MMU || !X2TLB
         help
           This is the default page size used by all SuperH CPUs.
 
 config PAGE_SIZE_8KB
         bool "8kB"
-        depends on X2TLB
+        depends on !MMU || X2TLB
         help
           This enables 8kB pages as supported by SH-X2 and later MMUs.
 
+config PAGE_SIZE_16KB
+        bool "16kB"
+        depends on !MMU
+        help
+          This enables 16kB pages on MMU-less SH systems.
+
 config PAGE_SIZE_64KB
         bool "64kB"
-        depends on CPU_SH4 || CPU_SH5
+        depends on !MMU || CPU_SH4 || CPU_SH5
         help
           This enables support for 64kB pages, possible on all SH-4
           CPUs and later.
 
 endchoice
 
+config ENTRY_OFFSET
+        hex
+        default "0x00001000" if PAGE_SIZE_4KB
+        default "0x00002000" if PAGE_SIZE_8KB
+        default "0x00004000" if PAGE_SIZE_16KB
+        default "0x00010000" if PAGE_SIZE_64KB
+        default "0x00000000"
+
 choice
         prompt "HugeTLB page size"
         depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c
index c5b56d52b7d2..0e189ccd4a77 100644
--- a/arch/sh/mm/cache-debugfs.c
+++ b/arch/sh/mm/cache-debugfs.c
@@ -120,7 +120,7 @@ static const struct file_operations cache_debugfs_fops = {
         .open           = cache_debugfs_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 static int __init cache_debugfs_init(void)
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 43d7ff6b6ec7..1fdc8d90254a 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 1999, 2000, 2002  Niibe Yutaka
  * Copyright (C) 2001 - 2007  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
+ * Copyright (c) 2007 STMicroelectronics (R&D) Ltd.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -22,6 +23,7 @@
  * entirety.
  */
 #define MAX_DCACHE_PAGES        64      /* XXX: Tune for ways */
+#define MAX_ICACHE_PAGES        32
 
 static void __flush_dcache_segment_1way(unsigned long start,
                                         unsigned long extent);
@@ -178,42 +180,45 @@ void __flush_invalidate_region(void *start, int size)
 /*
  * Write back the range of D-cache, and purge the I-cache.
  *
- * Called from kernel/module.c:sys_init_module and routine for a.out format.
+ * Called from kernel/module.c:sys_init_module and routine for a.out format,
+ * signal handler code and kprobes code
  */
 void flush_icache_range(unsigned long start, unsigned long end)
 {
-        flush_cache_all();
-}
-
-/*
- * Write back the D-cache and purge the I-cache for signal trampoline.
- * .. which happens to be the same behavior as flush_icache_range().
- * So, we simply flush out a line.
- */
-void __uses_jump_to_uncached flush_cache_sigtramp(unsigned long addr)
-{
-        unsigned long v, index;
-        unsigned long flags;
+        int icacheaddr;
+        unsigned long flags, v;
         int i;
 
-        v = addr & ~(L1_CACHE_BYTES-1);
-        asm volatile("ocbwb     %0"
-                     : /* no output */
-                     : "m" (__m(v)));
-
-        index = CACHE_IC_ADDRESS_ARRAY |
-                        (v & boot_cpu_data.icache.entry_mask);
-
-        local_irq_save(flags);
-        jump_to_uncached();
-
-        for (i = 0; i < boot_cpu_data.icache.ways;
-             i++, index += boot_cpu_data.icache.way_incr)
-                ctrl_outl(0, index);    /* Clear out Valid-bit */
-
-        back_to_cached();
-        wmb();
-        local_irq_restore(flags);
+       /* If there are too many pages then just blow the caches */
+        if (((end - start) >> PAGE_SHIFT) >= MAX_ICACHE_PAGES) {
+                flush_cache_all();
+       } else {
+               /* selectively flush d-cache then invalidate the i-cache */
+               /* this is inefficient, so only use for small ranges */
+               start &= ~(L1_CACHE_BYTES-1);
+               end += L1_CACHE_BYTES-1;
+               end &= ~(L1_CACHE_BYTES-1);
+
+               local_irq_save(flags);
+               jump_to_uncached();
+
+               for (v = start; v < end; v+=L1_CACHE_BYTES) {
+                       asm volatile("ocbwb     %0"
+                                    : /* no output */
+                                    : "m" (__m(v)));
+
+                       icacheaddr = CACHE_IC_ADDRESS_ARRAY | (
+                                       v & cpu_data->icache.entry_mask);
+
+                       for (i = 0; i < cpu_data->icache.ways;
+                               i++, icacheaddr += cpu_data->icache.way_incr)
+                                       /* Clear i-cache line valid-bit */
+                                       ctrl_outl(0, icacheaddr);
+               }
+
+                back_to_cached();
+                local_irq_restore(flags);
+        }
 }
 
 static inline void flush_cache_4096(unsigned long start,
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index d3c33fc5b1c2..b2ce014401b5 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -10,6 +10,7 @@
  * for more details.
  */
 #include <linux/mm.h>
+#include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <asm/cacheflush.h>
 #include <asm/addrspace.h>
@@ -27,21 +28,10 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
                            dma_addr_t *dma_handle, gfp_t gfp)
 {
         void *ret, *ret_nocache;
-        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
         int order = get_order(size);
 
-        if (mem) {
-                int page = bitmap_find_free_region(mem->bitmap, mem->size,
-                                                     order);
-                if (page >= 0) {
-                        *dma_handle = mem->device_base + (page << PAGE_SHIFT);
-                        ret = mem->virt_base + (page << PAGE_SHIFT);
-                        memset(ret, 0, size);
-                        return ret;
-                }
-                if (mem->flags & DMA_MEMORY_EXCLUSIVE)
-                        return NULL;
-        }
+        if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+                return ret;
 
         ret = (void *)__get_free_pages(gfp, order);
         if (!ret)
@@ -71,11 +61,7 @@ void dma_free_coherent(struct device *dev, size_t size,
         struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
         int order = get_order(size);
 
-        if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
-                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-
-                bitmap_release_region(mem->bitmap, page, order);
-        } else {
+        if (!dma_release_from_coherent(dev, order, vaddr)) {
                 WARN_ON(irqs_disabled());       /* for portability */
                 BUG_ON(mem && mem->flags & DMA_MEMORY_EXCLUSIVE);
                 free_pages((unsigned long)phys_to_virt(dma_handle), order);
@@ -84,83 +70,6 @@ void dma_free_coherent(struct device *dev, size_t size,
 }
 EXPORT_SYMBOL(dma_free_coherent);
 
-int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-                                dma_addr_t device_addr, size_t size, int flags)
-{
-        void __iomem *mem_base = NULL;
-        int pages = size >> PAGE_SHIFT;
-        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
-
-        if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
-                goto out;
-        if (!size)
-                goto out;
-        if (dev->dma_mem)
-                goto out;
-
-        /* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
-
-        mem_base = ioremap_nocache(bus_addr, size);
-        if (!mem_base)
-                goto out;
-
-        dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
-        if (!dev->dma_mem)
-                goto out;
-        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
-        if (!dev->dma_mem->bitmap)
-                goto free1_out;
-
-        dev->dma_mem->virt_base = mem_base;
-        dev->dma_mem->device_base = device_addr;
-        dev->dma_mem->size = pages;
-        dev->dma_mem->flags = flags;
-
-        if (flags & DMA_MEMORY_MAP)
-                return DMA_MEMORY_MAP;
-
-        return DMA_MEMORY_IO;
-
- free1_out:
-        kfree(dev->dma_mem);
- out:
-        if (mem_base)
-                iounmap(mem_base);
-        return 0;
-}
-EXPORT_SYMBOL(dma_declare_coherent_memory);
-
-void dma_release_declared_memory(struct device *dev)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-
-        if (!mem)
-                return;
-        dev->dma_mem = NULL;
-        iounmap(mem->virt_base);
-        kfree(mem->bitmap);
-        kfree(mem);
-}
-EXPORT_SYMBOL(dma_release_declared_memory);
-
-void *dma_mark_declared_memory_occupied(struct device *dev,
-                                        dma_addr_t device_addr, size_t size)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-        int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        int pos, err;
-
-        if (!mem)
-                return ERR_PTR(-EINVAL);
-
-        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
-        err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
-        if (err != 0)
-                return ERR_PTR(err);
-        return mem->virt_base + (pos << PAGE_SHIFT);
-}
-EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
-
 void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                     enum dma_data_direction direction)
 {
@@ -185,3 +94,32 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
         }
 }
 EXPORT_SYMBOL(dma_cache_sync);
+
+int platform_resource_setup_memory(struct platform_device *pdev,
+                                   char *name, unsigned long memsize)
+{
+        struct resource *r;
+        dma_addr_t dma_handle;
+        void *buf;
+
+        r = pdev->resource + pdev->num_resources - 1;
+        if (r->flags) {
+                pr_warning("%s: unable to find empty space for resource\n",
+                        name);
+                return -EINVAL;
+        }
+
+        buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL);
+        if (!buf) {
+                pr_warning("%s: unable to allocate memory\n", name);
+                return -ENOMEM;
+        }
+
+        memset(buf, 0, memsize);
+
+        r->flags = IORESOURCE_MEM;
+        r->start = dma_handle;
+        r->end = r->start + memsize - 1;
+        r->name = name;
+        return 0;
+}
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index d1fa27594c6e..0c776fdfbdda 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -37,16 +37,12 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         int fault;
         siginfo_t info;
 
-        trace_hardirqs_on();
-        local_irq_enable();
-
 #ifdef CONFIG_SH_KGDB
         if (kgdb_nofault && kgdb_bus_err_hook)
                 kgdb_bus_err_hook();
 #endif
 
         tsk = current;
-        mm = tsk->mm;
         si_code = SEGV_MAPERR;
 
         if (unlikely(address >= TASK_SIZE)) {
@@ -88,6 +84,14 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
                 return;
         }
 
+        /* Only enable interrupts if they were on before the fault */
+        if ((regs->sr & SR_IMASK) != SR_IMASK) {
+                trace_hardirqs_on();
+                local_irq_enable();
+        }
+
+        mm = tsk->mm;
+
         /*
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index 8c7a9ca79879..38870e0fc182 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(copy_user_highpage);
 /*
  * For SH-4, we have our own implementation for ptep_get_and_clear
  */
-inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
         pte_t pte = *ptep;
 
diff --git a/arch/sh/mm/pg-sh7705.c b/arch/sh/mm/pg-sh7705.c
index 7f885b7f8aff..eaf25147194c 100644
--- a/arch/sh/mm/pg-sh7705.c
+++ b/arch/sh/mm/pg-sh7705.c
@@ -118,7 +118,7 @@ void copy_user_page(void *to, void *from, unsigned long address, struct page *pg
  * For SH7705, we have our own implementation for ptep_get_and_clear
  * Copied from pg-sh4.c
  */
-inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
         pte_t pte = *ptep;
 
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index 46911bcbf17b..cef727669c87 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -385,7 +385,7 @@ static const struct file_operations pmb_debugfs_fops = {
         .open           = pmb_debugfs_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 static int __init pmb_debugfs_init(void)
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index 1bba7d36be90..0a11cc08f0a5 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -46,3 +46,7 @@ R2D_1			RTS7751R2D_1
 CAYMAN                  SH_CAYMAN
 SDK7780                 SH_SDK7780
 MIGOR                   SH_MIGOR
+RSK7203                 SH_RSK7203
+AP325RXA                SH_AP325RXA
+SH7763RDP               SH_SH7763RDP
+SH7785LCR               SH_SH7785LCR
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 375de7c6d082..a214002114ed 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -68,6 +68,7 @@ config SPARC
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_ARCH_KGDB if !SMP
+        select HAVE_ARCH_TRACEHOOK
 
 # Identify this as a Sparc32 build
 config SPARC32
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
new file mode 100644
index 000000000000..a5f0ce734ff7
--- /dev/null
+++ b/arch/sparc/include/asm/Kbuild
@@ -0,0 +1,45 @@
+# User exported sparc header files
+include include/asm-generic/Kbuild.asm
+
+header-y += ipcbuf_32.h
+header-y += ipcbuf_64.h
+header-y += posix_types_32.h
+header-y += posix_types_64.h
+header-y += ptrace_32.h
+header-y += ptrace_64.h
+header-y += sigcontext_32.h
+header-y += sigcontext_64.h
+header-y += siginfo_32.h
+header-y += siginfo_64.h
+header-y += signal_32.h
+header-y += signal_64.h
+header-y += stat_32.h
+header-y += stat_64.h
+header-y += statfs_32.h
+header-y += statfs_64.h
+header-y += unistd_32.h
+header-y += unistd_64.h
+
+header-y += apc.h
+header-y += asi.h
+header-y += bpp.h
+header-y += display7seg.h
+header-y += envctrl.h
+header-y += fbio.h
+header-y += jsflash.h
+header-y += openprom.h
+header-y += openprom_32.h
+header-y += openprom_64.h
+header-y += openpromio.h
+header-y += perfctr.h
+header-y += psrcompat.h
+header-y += psr.h
+header-y += pstate.h
+header-y += reg.h
+header-y += reg_32.h
+header-y += reg_64.h
+header-y += traps.h
+header-y += uctx.h
+header-y += utrap.h
+header-y += vfc_ioctls.h
+header-y += watchdog.h
diff --git a/include/asm-sparc/agp.h b/arch/sparc/include/asm/agp.h
index c2456870b05c..c2456870b05c 100644
--- a/include/asm-sparc/agp.h
+++ b/arch/sparc/include/asm/agp.h
diff --git a/include/asm-sparc/apb.h b/arch/sparc/include/asm/apb.h
index 8f3b57db810f..8f3b57db810f 100644
--- a/include/asm-sparc/apb.h
+++ b/arch/sparc/include/asm/apb.h
diff --git a/include/asm-sparc/apc.h b/arch/sparc/include/asm/apc.h
index 24e9a7d4d97e..24e9a7d4d97e 100644
--- a/include/asm-sparc/apc.h
+++ b/arch/sparc/include/asm/apc.h
diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h
index 74703c5ef985..74703c5ef985 100644
--- a/include/asm-sparc/asi.h
+++ b/arch/sparc/include/asm/asi.h
diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
index a619a4d97aae..a619a4d97aae 100644
--- a/include/asm-sparc/asmmacro.h
+++ b/arch/sparc/include/asm/asmmacro.h
diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h
index 66d8166ec1d7..8ff83d8cc33f 100644
--- a/include/asm-sparc/atomic.h
+++ b/arch/sparc/include/asm/atomic.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_ATOMIC_H
 #define ___ASM_SPARC_ATOMIC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/atomic_64.h>
+#include <asm/atomic_64.h>
 #else
-#include <asm-sparc/atomic_32.h>
+#include <asm/atomic_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
index 5c944b5a8040..5c944b5a8040 100644
--- a/include/asm-sparc/atomic_32.h
+++ b/arch/sparc/include/asm/atomic_32.h
diff --git a/include/asm-sparc/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
index 2c71ec4a3b18..2c71ec4a3b18 100644
--- a/include/asm-sparc/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
diff --git a/include/asm-sparc/auxio.h b/arch/sparc/include/asm/auxio.h
index 24c6f3c0f577..13dc67f03011 100644
--- a/include/asm-sparc/auxio.h
+++ b/arch/sparc/include/asm/auxio.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_AUXIO_H
 #define ___ASM_SPARC_AUXIO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/auxio_64.h>
+#include <asm/auxio_64.h>
 #else
-#include <asm-sparc/auxio_32.h>
+#include <asm/auxio_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
index 4db8f23db20f..e03e088be95f 100644
--- a/include/asm-sparc/auxio_32.h
+++ b/arch/sparc/include/asm/auxio_32.h
@@ -36,7 +36,7 @@
  * understand the hardware you are querying!
  */
 extern void set_auxio(unsigned char bits_on, unsigned char bits_off);
-extern unsigned char get_auxio(void); /* .../asm-sparc/floppy.h */
+extern unsigned char get_auxio(void); /* .../asm/floppy.h */
 
 /*
  * The following routines are provided for driver-compatibility
diff --git a/include/asm-sparc/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
index f61cd1e3e395..f61cd1e3e395 100644
--- a/include/asm-sparc/auxio_64.h
+++ b/arch/sparc/include/asm/auxio_64.h
diff --git a/include/asm-sparc/auxvec.h b/arch/sparc/include/asm/auxvec.h
index ad6f360261f6..ad6f360261f6 100644
--- a/include/asm-sparc/auxvec.h
+++ b/arch/sparc/include/asm/auxvec.h
diff --git a/include/asm-sparc/backoff.h b/arch/sparc/include/asm/backoff.h
index fa1fdf67e350..fa1fdf67e350 100644
--- a/include/asm-sparc/backoff.h
+++ b/arch/sparc/include/asm/backoff.h
diff --git a/include/asm-sparc/bbc.h b/arch/sparc/include/asm/bbc.h
index 423a85800aae..423a85800aae 100644
--- a/include/asm-sparc/bbc.h
+++ b/arch/sparc/include/asm/bbc.h
diff --git a/include/asm-sparc/bitext.h b/arch/sparc/include/asm/bitext.h
index 297b2f2fcb49..297b2f2fcb49 100644
--- a/include/asm-sparc/bitext.h
+++ b/arch/sparc/include/asm/bitext.h
diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h
index 1a2949d0193f..b1edd94bd64f 100644
--- a/include/asm-sparc/bitops.h
+++ b/arch/sparc/include/asm/bitops.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_BITOPS_H
 #define ___ASM_SPARC_BITOPS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/bitops_64.h>
+#include <asm/bitops_64.h>
 #else
-#include <asm-sparc/bitops_32.h>
+#include <asm/bitops_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
index 68b98a7e6454..68b98a7e6454 100644
--- a/include/asm-sparc/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
diff --git a/include/asm-sparc/bitops_64.h b/arch/sparc/include/asm/bitops_64.h
index bb87b8080220..bb87b8080220 100644
--- a/include/asm-sparc/bitops_64.h
+++ b/arch/sparc/include/asm/bitops_64.h
diff --git a/include/asm-sparc/bpp.h b/arch/sparc/include/asm/bpp.h
index 31f515e499a7..31f515e499a7 100644
--- a/include/asm-sparc/bpp.h
+++ b/arch/sparc/include/asm/bpp.h
diff --git a/include/asm-sparc/btfixup.h b/arch/sparc/include/asm/btfixup.h
index 08277e6fb4cd..797722cf69f2 100644
--- a/include/asm-sparc/btfixup.h
+++ b/arch/sparc/include/asm/btfixup.h
@@ -1,5 +1,5 @@
 /*
- *  asm-sparc/btfixup.h:    Macros for boot time linking.
+ *  asm/btfixup.h:    Macros for boot time linking.
  *
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
diff --git a/include/asm-sparc/bug.h b/arch/sparc/include/asm/bug.h
index 8a59e5a8c217..8a59e5a8c217 100644
--- a/include/asm-sparc/bug.h
+++ b/arch/sparc/include/asm/bug.h
diff --git a/include/asm-sparc/bugs.h b/arch/sparc/include/asm/bugs.h
index 2dfc07bc8e54..e179bc12f64a 100644
--- a/include/asm-sparc/bugs.h
+++ b/arch/sparc/include/asm/bugs.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/bugs.h:  Sparc probes for various bugs.
+/* include/asm/bugs.h:  Sparc probes for various bugs.
  *
  * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
  */
diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h
index bcd83aa351c5..bcd83aa351c5 100644
--- a/include/asm-sparc/byteorder.h
+++ b/arch/sparc/include/asm/byteorder.h
diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h
index 41f85ae4bd4a..41f85ae4bd4a 100644
--- a/include/asm-sparc/cache.h
+++ b/arch/sparc/include/asm/cache.h
diff --git a/include/asm-sparc/cacheflush.h b/arch/sparc/include/asm/cacheflush.h
index 2b6a37957c2d..049168087b19 100644
--- a/include/asm-sparc/cacheflush.h
+++ b/arch/sparc/include/asm/cacheflush.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CACHEFLUSH_H
 #define ___ASM_SPARC_CACHEFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cacheflush_64.h>
+#include <asm/cacheflush_64.h>
 #else
-#include <asm-sparc/cacheflush_32.h>
+#include <asm/cacheflush_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h
index 68ac10910271..68ac10910271 100644
--- a/include/asm-sparc/cacheflush_32.h
+++ b/arch/sparc/include/asm/cacheflush_32.h
diff --git a/include/asm-sparc/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
index c43321729b3b..c43321729b3b 100644
--- a/include/asm-sparc/cacheflush_64.h
+++ b/arch/sparc/include/asm/cacheflush_64.h
diff --git a/include/asm-sparc/chafsr.h b/arch/sparc/include/asm/chafsr.h
index 85c69b38220b..85c69b38220b 100644
--- a/include/asm-sparc/chafsr.h
+++ b/arch/sparc/include/asm/chafsr.h
diff --git a/include/asm-sparc/checksum.h b/arch/sparc/include/asm/checksum.h
index 4e3553d4f6e1..7ac0d7497bc5 100644
--- a/include/asm-sparc/checksum.h
+++ b/arch/sparc/include/asm/checksum.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CHECKSUM_H
 #define ___ASM_SPARC_CHECKSUM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/checksum_64.h>
+#include <asm/checksum_64.h>
 #else
-#include <asm-sparc/checksum_32.h>
+#include <asm/checksum_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/checksum_32.h b/arch/sparc/include/asm/checksum_32.h
index bdbda1453aa9..bdbda1453aa9 100644
--- a/include/asm-sparc/checksum_32.h
+++ b/arch/sparc/include/asm/checksum_32.h
diff --git a/include/asm-sparc/checksum_64.h b/arch/sparc/include/asm/checksum_64.h
index 019b9615e43c..019b9615e43c 100644
--- a/include/asm-sparc/checksum_64.h
+++ b/arch/sparc/include/asm/checksum_64.h
diff --git a/include/asm-sparc/chmctrl.h b/arch/sparc/include/asm/chmctrl.h
index 859b4a4b0d30..859b4a4b0d30 100644
--- a/include/asm-sparc/chmctrl.h
+++ b/arch/sparc/include/asm/chmctrl.h
diff --git a/include/asm-sparc/clock.h b/arch/sparc/include/asm/clock.h
index 2cf99dadec56..2cf99dadec56 100644
--- a/include/asm-sparc/clock.h
+++ b/arch/sparc/include/asm/clock.h
diff --git a/include/asm-sparc/cmt.h b/arch/sparc/include/asm/cmt.h
index 870db5928577..870db5928577 100644
--- a/include/asm-sparc/cmt.h
+++ b/arch/sparc/include/asm/cmt.h
diff --git a/include/asm-sparc/compat.h b/arch/sparc/include/asm/compat.h
index f260b58f5ce9..f260b58f5ce9 100644
--- a/include/asm-sparc/compat.h
+++ b/arch/sparc/include/asm/compat.h
diff --git a/include/asm-sparc/compat_signal.h b/arch/sparc/include/asm/compat_signal.h
index b759eab9b51c..b759eab9b51c 100644
--- a/include/asm-sparc/compat_signal.h
+++ b/arch/sparc/include/asm/compat_signal.h
diff --git a/include/asm-sparc/contregs.h b/arch/sparc/include/asm/contregs.h
index 48fa8a4ef357..48fa8a4ef357 100644
--- a/include/asm-sparc/contregs.h
+++ b/arch/sparc/include/asm/contregs.h
diff --git a/include/asm-sparc/cpudata.h b/arch/sparc/include/asm/cpudata.h
index b76fac0c8d8f..b5976de7cacd 100644
--- a/include/asm-sparc/cpudata.h
+++ b/arch/sparc/include/asm/cpudata.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CPUDATA_H
 #define ___ASM_SPARC_CPUDATA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cpudata_64.h>
+#include <asm/cpudata_64.h>
 #else
-#include <asm-sparc/cpudata_32.h>
+#include <asm/cpudata_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/cpudata_32.h b/arch/sparc/include/asm/cpudata_32.h
index a2c4d51d36c4..31d48a0e32c7 100644
--- a/include/asm-sparc/cpudata_32.h
+++ b/arch/sparc/include/asm/cpudata_32.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org)
  *
- * Based on include/asm-sparc64/cpudata.h and Linux 2.4 smp.h
+ * Based on include/asm/cpudata.h and Linux 2.4 smp.h
  * both (C) David S. Miller.
  */
 
diff --git a/include/asm-sparc/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index 532975ecfe10..532975ecfe10 100644
--- a/include/asm-sparc/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
diff --git a/include/asm-sparc/cputime.h b/arch/sparc/include/asm/cputime.h
index 1a642b81e019..1a642b81e019 100644
--- a/include/asm-sparc/cputime.h
+++ b/arch/sparc/include/asm/cputime.h
diff --git a/include/asm-sparc/current.h b/arch/sparc/include/asm/current.h
index 8a1d9d6643b0..10a0df55a574 100644
--- a/include/asm-sparc/current.h
+++ b/arch/sparc/include/asm/current.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/current.h
+/* include/asm/current.h
  *
  * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  * Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com)
diff --git a/include/asm-sparc/cypress.h b/arch/sparc/include/asm/cypress.h
index 95e9772ea394..95e9772ea394 100644
--- a/include/asm-sparc/cypress.h
+++ b/arch/sparc/include/asm/cypress.h
diff --git a/include/asm-sparc/dcr.h b/arch/sparc/include/asm/dcr.h
index 620c9ba642e9..620c9ba642e9 100644
--- a/include/asm-sparc/dcr.h
+++ b/arch/sparc/include/asm/dcr.h
diff --git a/include/asm-sparc/dcu.h b/arch/sparc/include/asm/dcu.h
index 0f704e106a1b..0f704e106a1b 100644
--- a/include/asm-sparc/dcu.h
+++ b/arch/sparc/include/asm/dcu.h
diff --git a/include/asm-sparc/delay.h b/arch/sparc/include/asm/delay.h
index 6210a3ce9751..467caa2a97a0 100644
--- a/include/asm-sparc/delay.h
+++ b/arch/sparc/include/asm/delay.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DELAY_H
 #define ___ASM_SPARC_DELAY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/delay_64.h>
+#include <asm/delay_64.h>
 #else
-#include <asm-sparc/delay_32.h>
+#include <asm/delay_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/delay_32.h b/arch/sparc/include/asm/delay_32.h
index bc9aba2bead6..bc9aba2bead6 100644
--- a/include/asm-sparc/delay_32.h
+++ b/arch/sparc/include/asm/delay_32.h
diff --git a/include/asm-sparc/delay_64.h b/arch/sparc/include/asm/delay_64.h
index a77aa622d762..a77aa622d762 100644
--- a/include/asm-sparc/delay_64.h
+++ b/arch/sparc/include/asm/delay_64.h
diff --git a/include/asm-sparc/device.h b/arch/sparc/include/asm/device.h
index 19790eb99cc6..19790eb99cc6 100644
--- a/include/asm-sparc/device.h
+++ b/arch/sparc/include/asm/device.h
diff --git a/include/asm-sparc/display7seg.h b/arch/sparc/include/asm/display7seg.h
index 86d4a901df24..86d4a901df24 100644
--- a/include/asm-sparc/display7seg.h
+++ b/arch/sparc/include/asm/display7seg.h
diff --git a/include/asm-sparc/div64.h b/arch/sparc/include/asm/div64.h
index 6cd978cefb28..6cd978cefb28 100644
--- a/include/asm-sparc/div64.h
+++ b/arch/sparc/include/asm/div64.h
diff --git a/include/asm-sparc/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 7483504259ce..0f4150e26619 100644
--- a/include/asm-sparc/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DMA_MAPPING_H
 #define ___ASM_SPARC_DMA_MAPPING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma-mapping_64.h>
+#include <asm/dma-mapping_64.h>
 #else
-#include <asm-sparc/dma-mapping_32.h>
+#include <asm/dma-mapping_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h
index f3a641e6b2c8..f3a641e6b2c8 100644
--- a/include/asm-sparc/dma-mapping_32.h
+++ b/arch/sparc/include/asm/dma-mapping_32.h
diff --git a/include/asm-sparc/dma-mapping_64.h b/arch/sparc/include/asm/dma-mapping_64.h
index bfa64f9702d5..bfa64f9702d5 100644
--- a/include/asm-sparc/dma-mapping_64.h
+++ b/arch/sparc/include/asm/dma-mapping_64.h
diff --git a/include/asm-sparc/dma.h b/arch/sparc/include/asm/dma.h
index 8cc69bfaae2a..aa1d90ac04c5 100644
--- a/include/asm-sparc/dma.h
+++ b/arch/sparc/include/asm/dma.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DMA_H
 #define ___ASM_SPARC_DMA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma_64.h>
+#include <asm/dma_64.h>
 #else
-#include <asm-sparc/dma_32.h>
+#include <asm/dma_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/dma_32.h b/arch/sparc/include/asm/dma_32.h
index 959d6c8a71ae..cf7189c0079b 100644
--- a/include/asm-sparc/dma_32.h
+++ b/arch/sparc/include/asm/dma_32.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/dma.h
+/* include/asm/dma.h
  *
  * Copyright 1995 (C) David S. Miller (davem@davemloft.net)
  */
diff --git a/include/asm-sparc/dma_64.h b/arch/sparc/include/asm/dma_64.h
index 9d4c024bd3b3..46a8aecffc02 100644
--- a/include/asm-sparc/dma_64.h
+++ b/arch/sparc/include/asm/dma_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/dma.h
+ * include/asm/dma.h
  *
  * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
  */
diff --git a/include/asm-sparc/ebus.h b/arch/sparc/include/asm/ebus.h
index a5da2d00cd18..83a6d16c22e6 100644
--- a/include/asm-sparc/ebus.h
+++ b/arch/sparc/include/asm/ebus.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_EBUS_H
 #define ___ASM_SPARC_EBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ebus_64.h>
+#include <asm/ebus_64.h>
 #else
-#include <asm-sparc/ebus_32.h>
+#include <asm/ebus_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/ebus_32.h b/arch/sparc/include/asm/ebus_32.h
index 29cb7dfc6b79..29cb7dfc6b79 100644
--- a/include/asm-sparc/ebus_32.h
+++ b/arch/sparc/include/asm/ebus_32.h
diff --git a/include/asm-sparc/ebus_64.h b/arch/sparc/include/asm/ebus_64.h
index fcc62b97ced5..fcc62b97ced5 100644
--- a/include/asm-sparc/ebus_64.h
+++ b/arch/sparc/include/asm/ebus_64.h
diff --git a/include/asm-sparc/ecc.h b/arch/sparc/include/asm/ecc.h
index ccb84b66fef1..ccb84b66fef1 100644
--- a/include/asm-sparc/ecc.h
+++ b/arch/sparc/include/asm/ecc.h
diff --git a/include/asm-sparc/eeprom.h b/arch/sparc/include/asm/eeprom.h
index e17beeceb405..e17beeceb405 100644
--- a/include/asm-sparc/eeprom.h
+++ b/arch/sparc/include/asm/eeprom.h
diff --git a/include/asm-sparc/elf.h b/arch/sparc/include/asm/elf.h
index f035c45d7b5e..0a2816c50b07 100644
--- a/include/asm-sparc/elf.h
+++ b/arch/sparc/include/asm/elf.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_ELF_H
 #define ___ASM_SPARC_ELF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/elf_64.h>
+#include <asm/elf_64.h>
 #else
-#include <asm-sparc/elf_32.h>
+#include <asm/elf_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/elf_32.h b/arch/sparc/include/asm/elf_32.h
index d043f80bc2fd..d043f80bc2fd 100644
--- a/include/asm-sparc/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
diff --git a/include/asm-sparc/elf_64.h b/arch/sparc/include/asm/elf_64.h
index 0818a1308f4e..0818a1308f4e 100644
--- a/include/asm-sparc/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
diff --git a/include/asm-sparc/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h
index 108d8c48e42e..108d8c48e42e 100644
--- a/include/asm-sparc/emergency-restart.h
+++ b/arch/sparc/include/asm/emergency-restart.h
diff --git a/include/asm-sparc/envctrl.h b/arch/sparc/include/asm/envctrl.h
index 624fa7e2da8e..624fa7e2da8e 100644
--- a/include/asm-sparc/envctrl.h
+++ b/arch/sparc/include/asm/envctrl.h
diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h
index a9ef172977de..a9ef172977de 100644
--- a/include/asm-sparc/errno.h
+++ b/arch/sparc/include/asm/errno.h
diff --git a/include/asm-sparc/estate.h b/arch/sparc/include/asm/estate.h
index 520c08560d1b..520c08560d1b 100644
--- a/include/asm-sparc/estate.h
+++ b/arch/sparc/include/asm/estate.h
diff --git a/include/asm-sparc/fb.h b/arch/sparc/include/asm/fb.h
index b83e44729655..b83e44729655 100644
--- a/include/asm-sparc/fb.h
+++ b/arch/sparc/include/asm/fb.h
diff --git a/include/asm-sparc/fbio.h b/arch/sparc/include/asm/fbio.h
index b9215a0907d3..b9215a0907d3 100644
--- a/include/asm-sparc/fbio.h
+++ b/arch/sparc/include/asm/fbio.h
diff --git a/include/asm-sparc/fcntl.h b/arch/sparc/include/asm/fcntl.h
index d4d9c9d852c3..d4d9c9d852c3 100644
--- a/include/asm-sparc/fcntl.h
+++ b/arch/sparc/include/asm/fcntl.h
diff --git a/include/asm-sparc/fhc.h b/arch/sparc/include/asm/fhc.h
index 788cbc46a116..788cbc46a116 100644
--- a/include/asm-sparc/fhc.h
+++ b/arch/sparc/include/asm/fhc.h
diff --git a/include/asm-sparc/fixmap.h b/arch/sparc/include/asm/fixmap.h
index f18fc0755adf..f18fc0755adf 100644
--- a/include/asm-sparc/fixmap.h
+++ b/arch/sparc/include/asm/fixmap.h
diff --git a/include/asm-sparc/floppy.h b/arch/sparc/include/asm/floppy.h
index 6c628ba15a8d..faebd335b600 100644
--- a/include/asm-sparc/floppy.h
+++ b/arch/sparc/include/asm/floppy.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_FLOPPY_H
 #define ___ASM_SPARC_FLOPPY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/floppy_64.h>
+#include <asm/floppy_64.h>
 #else
-#include <asm-sparc/floppy_32.h>
+#include <asm/floppy_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
index acdd06eafe59..ae3f00bf22ff 100644
--- a/include/asm-sparc/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -1,4 +1,4 @@
-/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
+/* asm/floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1995 David S. Miller (davem@davemloft.net)
  */
diff --git a/include/asm-sparc/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
index c39db1060bc7..c39db1060bc7 100644
--- a/include/asm-sparc/floppy_64.h
+++ b/arch/sparc/include/asm/floppy_64.h
diff --git a/include/asm-sparc/fpumacro.h b/arch/sparc/include/asm/fpumacro.h
index cc463fec806f..cc463fec806f 100644
--- a/include/asm-sparc/fpumacro.h
+++ b/arch/sparc/include/asm/fpumacro.h
diff --git a/include/asm-sparc64/ftrace.h b/arch/sparc/include/asm/ftrace.h
index d27716cd38c1..d27716cd38c1 100644
--- a/include/asm-sparc64/ftrace.h
+++ b/arch/sparc/include/asm/ftrace.h
diff --git a/include/asm-sparc/futex.h b/arch/sparc/include/asm/futex.h
index c6a9f038c531..736335f36713 100644
--- a/include/asm-sparc/futex.h
+++ b/arch/sparc/include/asm/futex.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_FUTEX_H
 #define ___ASM_SPARC_FUTEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/futex_64.h>
+#include <asm/futex_64.h>
 #else
-#include <asm-sparc/futex_32.h>
+#include <asm/futex_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/futex_32.h b/arch/sparc/include/asm/futex_32.h
index 6a332a9f099c..6a332a9f099c 100644
--- a/include/asm-sparc/futex_32.h
+++ b/arch/sparc/include/asm/futex_32.h
diff --git a/include/asm-sparc/futex_64.h b/arch/sparc/include/asm/futex_64.h
index d8378935ae90..d8378935ae90 100644
--- a/include/asm-sparc/futex_64.h
+++ b/arch/sparc/include/asm/futex_64.h
diff --git a/include/asm-sparc/hardirq.h b/arch/sparc/include/asm/hardirq.h
index 156478773100..44d4e2345148 100644
--- a/include/asm-sparc/hardirq.h
+++ b/arch/sparc/include/asm/hardirq.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_HARDIRQ_H
 #define ___ASM_SPARC_HARDIRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/hardirq_64.h>
+#include <asm/hardirq_64.h>
 #else
-#include <asm-sparc/hardirq_32.h>
+#include <asm/hardirq_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h
index 4f63ed8df551..4f63ed8df551 100644
--- a/include/asm-sparc/hardirq_32.h
+++ b/arch/sparc/include/asm/hardirq_32.h
diff --git a/include/asm-sparc/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h
index 7c29fd1a87aa..7c29fd1a87aa 100644
--- a/include/asm-sparc/hardirq_64.h
+++ b/arch/sparc/include/asm/hardirq_64.h
diff --git a/include/asm-sparc/head.h b/arch/sparc/include/asm/head.h
index 14652abdea31..be8f03f3e731 100644
--- a/include/asm-sparc/head.h
+++ b/arch/sparc/include/asm/head.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_HEAD_H
 #define ___ASM_SPARC_HEAD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/head_64.h>
+#include <asm/head_64.h>
 #else
-#include <asm-sparc/head_32.h>
+#include <asm/head_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/head_32.h b/arch/sparc/include/asm/head_32.h
index 7c35491a8b53..7c35491a8b53 100644
--- a/include/asm-sparc/head_32.h
+++ b/arch/sparc/include/asm/head_32.h
diff --git a/include/asm-sparc/head_64.h b/arch/sparc/include/asm/head_64.h
index 10e9dabc4c41..10e9dabc4c41 100644
--- a/include/asm-sparc/head_64.h
+++ b/arch/sparc/include/asm/head_64.h
diff --git a/include/asm-sparc/highmem.h b/arch/sparc/include/asm/highmem.h
index 3de42e776274..3de42e776274 100644
--- a/include/asm-sparc/highmem.h
+++ b/arch/sparc/include/asm/highmem.h
diff --git a/include/asm-sparc/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index 177061064ee6..177061064ee6 100644
--- a/include/asm-sparc/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
diff --git a/include/asm-sparc/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
index b2b9b947b3a4..b2b9b947b3a4 100644
--- a/include/asm-sparc/hvtramp.h
+++ b/arch/sparc/include/asm/hvtramp.h
diff --git a/include/asm-sparc/hw_irq.h b/arch/sparc/include/asm/hw_irq.h
index 8d30a7694be2..8d30a7694be2 100644
--- a/include/asm-sparc/hw_irq.h
+++ b/arch/sparc/include/asm/hw_irq.h
diff --git a/include/asm-sparc/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index 109ae24ba242..109ae24ba242 100644
--- a/include/asm-sparc/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
diff --git a/include/asm-sparc/ide.h b/arch/sparc/include/asm/ide.h
index b7af3d658239..b7af3d658239 100644
--- a/include/asm-sparc/ide.h
+++ b/arch/sparc/include/asm/ide.h
diff --git a/include/asm-sparc/idprom.h b/arch/sparc/include/asm/idprom.h
index 6976aa2439c6..6976aa2439c6 100644
--- a/include/asm-sparc/idprom.h
+++ b/arch/sparc/include/asm/idprom.h
diff --git a/include/asm-sparc/intr_queue.h b/arch/sparc/include/asm/intr_queue.h
index 206077dedc2a..206077dedc2a 100644
--- a/include/asm-sparc/intr_queue.h
+++ b/arch/sparc/include/asm/intr_queue.h
diff --git a/include/asm-sparc/io-unit.h b/arch/sparc/include/asm/io-unit.h
index 96823b47fd45..96823b47fd45 100644
--- a/include/asm-sparc/io-unit.h
+++ b/arch/sparc/include/asm/io-unit.h
diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h
index fc9024d3dfc3..a34b2994937a 100644
--- a/include/asm-sparc/io.h
+++ b/arch/sparc/include/asm/io.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IO_H
 #define ___ASM_SPARC_IO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/io_64.h>
+#include <asm/io_64.h>
 #else
-#include <asm-sparc/io_32.h>
+#include <asm/io_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/io_32.h b/arch/sparc/include/asm/io_32.h
index 10d7da450070..10d7da450070 100644
--- a/include/asm-sparc/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
diff --git a/include/asm-sparc/io_64.h b/arch/sparc/include/asm/io_64.h
index 0bff078ffdd0..0bff078ffdd0 100644
--- a/include/asm-sparc/io_64.h
+++ b/arch/sparc/include/asm/io_64.h
diff --git a/include/asm-sparc/ioctl.h b/arch/sparc/include/asm/ioctl.h
index 7d6bd51321b9..7d6bd51321b9 100644
--- a/include/asm-sparc/ioctl.h
+++ b/arch/sparc/include/asm/ioctl.h
diff --git a/include/asm-sparc/ioctls.h b/arch/sparc/include/asm/ioctls.h
index 1fe6855c5c18..1fe6855c5c18 100644
--- a/include/asm-sparc/ioctls.h
+++ b/arch/sparc/include/asm/ioctls.h
diff --git a/include/asm-sparc/iommu.h b/arch/sparc/include/asm/iommu.h
index 91b072b0d7a0..e650965b4a8d 100644
--- a/include/asm-sparc/iommu.h
+++ b/arch/sparc/include/asm/iommu.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IOMMU_H
 #define ___ASM_SPARC_IOMMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/iommu_64.h>
+#include <asm/iommu_64.h>
 #else
-#include <asm-sparc/iommu_32.h>
+#include <asm/iommu_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/iommu_32.h b/arch/sparc/include/asm/iommu_32.h
index 70c589c05a10..70c589c05a10 100644
--- a/include/asm-sparc/iommu_32.h
+++ b/arch/sparc/include/asm/iommu_32.h
diff --git a/include/asm-sparc/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index d7b9afcba08b..d7b9afcba08b 100644
--- a/include/asm-sparc/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
diff --git a/include/asm-sparc/ipcbuf.h b/arch/sparc/include/asm/ipcbuf.h
index 037605d986e2..17d6ef7b23a4 100644
--- a/include/asm-sparc/ipcbuf.h
+++ b/arch/sparc/include/asm/ipcbuf.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IPCBUF_H
 #define ___ASM_SPARC_IPCBUF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ipcbuf_64.h>
+#include <asm/ipcbuf_64.h>
 #else
-#include <asm-sparc/ipcbuf_32.h>
+#include <asm/ipcbuf_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/ipcbuf_32.h b/arch/sparc/include/asm/ipcbuf_32.h
index 6387209518f2..6387209518f2 100644
--- a/include/asm-sparc/ipcbuf_32.h
+++ b/arch/sparc/include/asm/ipcbuf_32.h
diff --git a/include/asm-sparc/ipcbuf_64.h b/arch/sparc/include/asm/ipcbuf_64.h
index a44b855b98db..a44b855b98db 100644
--- a/include/asm-sparc/ipcbuf_64.h
+++ b/arch/sparc/include/asm/ipcbuf_64.h
diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h
index 7af6bb4aa09c..3b44a6a14074 100644
--- a/include/asm-sparc/irq.h
+++ b/arch/sparc/include/asm/irq.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IRQ_H
 #define ___ASM_SPARC_IRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irq_64.h>
+#include <asm/irq_64.h>
 #else
-#include <asm-sparc/irq_32.h>
+#include <asm/irq_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/irq_32.h b/arch/sparc/include/asm/irq_32.h
index fe205cc444b8..fe205cc444b8 100644
--- a/include/asm-sparc/irq_32.h
+++ b/arch/sparc/include/asm/irq_32.h
diff --git a/include/asm-sparc/irq_64.h b/arch/sparc/include/asm/irq_64.h
index 0bb9bf531745..0bb9bf531745 100644
--- a/include/asm-sparc/irq_64.h
+++ b/arch/sparc/include/asm/irq_64.h
diff --git a/include/asm-sparc/irq_regs.h b/arch/sparc/include/asm/irq_regs.h
index 3dd9c0b70270..3dd9c0b70270 100644
--- a/include/asm-sparc/irq_regs.h
+++ b/arch/sparc/include/asm/irq_regs.h
diff --git a/include/asm-sparc/irqflags.h b/arch/sparc/include/asm/irqflags.h
index c6402b187e23..1e138632bd3f 100644
--- a/include/asm-sparc/irqflags.h
+++ b/arch/sparc/include/asm/irqflags.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IRQFLAGS_H
 #define ___ASM_SPARC_IRQFLAGS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irqflags_64.h>
+#include <asm/irqflags_64.h>
 #else
-#include <asm-sparc/irqflags_32.h>
+#include <asm/irqflags_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
index db398fb32826..0fca9d97d44f 100644
--- a/include/asm-sparc/irqflags_32.h
+++ b/arch/sparc/include/asm/irqflags_32.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
diff --git a/include/asm-sparc/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
index 024fc54d0682..bb42e59162aa 100644
--- a/include/asm-sparc/irqflags_64.h
+++ b/arch/sparc/include/asm/irqflags_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
diff --git a/include/asm-sparc/jsflash.h b/arch/sparc/include/asm/jsflash.h
index 3457f29bd73b..3457f29bd73b 100644
--- a/include/asm-sparc/jsflash.h
+++ b/arch/sparc/include/asm/jsflash.h
diff --git a/include/asm-sparc/kdebug.h b/arch/sparc/include/asm/kdebug.h
index fe07d00d0534..8d12581ca386 100644
--- a/include/asm-sparc/kdebug.h
+++ b/arch/sparc/include/asm/kdebug.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_KDEBUG_H
 #define ___ASM_SPARC_KDEBUG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/kdebug_64.h>
+#include <asm/kdebug_64.h>
 #else
-#include <asm-sparc/kdebug_32.h>
+#include <asm/kdebug_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h
index f69fe7d84b3c..f69fe7d84b3c 100644
--- a/include/asm-sparc/kdebug_32.h
+++ b/arch/sparc/include/asm/kdebug_32.h
diff --git a/include/asm-sparc/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h
index f905b773235a..f905b773235a 100644
--- a/include/asm-sparc/kdebug_64.h
+++ b/arch/sparc/include/asm/kdebug_64.h
diff --git a/include/asm-sparc/kgdb.h b/arch/sparc/include/asm/kgdb.h
index b6ef301d05bf..b6ef301d05bf 100644
--- a/include/asm-sparc/kgdb.h
+++ b/arch/sparc/include/asm/kgdb.h
diff --git a/include/asm-sparc/kmap_types.h b/arch/sparc/include/asm/kmap_types.h
index 602f5e034f7a..602f5e034f7a 100644
--- a/include/asm-sparc/kmap_types.h
+++ b/arch/sparc/include/asm/kmap_types.h
diff --git a/include/asm-sparc/kprobes.h b/arch/sparc/include/asm/kprobes.h
index 5879d71afdaa..5879d71afdaa 100644
--- a/include/asm-sparc/kprobes.h
+++ b/arch/sparc/include/asm/kprobes.h
diff --git a/include/asm-sparc/ldc.h b/arch/sparc/include/asm/ldc.h
index bdb524a7b814..bdb524a7b814 100644
--- a/include/asm-sparc/ldc.h
+++ b/arch/sparc/include/asm/ldc.h
diff --git a/include/asm-sparc/linkage.h b/arch/sparc/include/asm/linkage.h
index 291c2d01c44f..291c2d01c44f 100644
--- a/include/asm-sparc/linkage.h
+++ b/arch/sparc/include/asm/linkage.h
diff --git a/include/asm-sparc/lmb.h b/arch/sparc/include/asm/lmb.h
index 6a352cbcf520..6a352cbcf520 100644
--- a/include/asm-sparc/lmb.h
+++ b/arch/sparc/include/asm/lmb.h
diff --git a/include/asm-sparc/local.h b/arch/sparc/include/asm/local.h
index bc80815a435c..bc80815a435c 100644
--- a/include/asm-sparc/local.h
+++ b/arch/sparc/include/asm/local.h
diff --git a/include/asm-sparc/lsu.h b/arch/sparc/include/asm/lsu.h
index 7190f8de90a0..7190f8de90a0 100644
--- a/include/asm-sparc/lsu.h
+++ b/arch/sparc/include/asm/lsu.h
diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h
index c28c2f248794..c28c2f248794 100644
--- a/include/asm-sparc/machines.h
+++ b/arch/sparc/include/asm/machines.h
diff --git a/include/asm-sparc/mbus.h b/arch/sparc/include/asm/mbus.h
index 69f07a022ee6..69f07a022ee6 100644
--- a/include/asm-sparc/mbus.h
+++ b/arch/sparc/include/asm/mbus.h
diff --git a/include/asm-sparc/mc146818rtc.h b/arch/sparc/include/asm/mc146818rtc.h
index 9ab65c21e9e4..67ed9e3a0235 100644
--- a/include/asm-sparc/mc146818rtc.h
+++ b/arch/sparc/include/asm/mc146818rtc.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MC146818RTC_H
 #define ___ASM_SPARC_MC146818RTC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mc146818rtc_64.h>
+#include <asm/mc146818rtc_64.h>
 #else
-#include <asm-sparc/mc146818rtc_32.h>
+#include <asm/mc146818rtc_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/mc146818rtc_32.h b/arch/sparc/include/asm/mc146818rtc_32.h
index fa7eac926582..fa7eac926582 100644
--- a/include/asm-sparc/mc146818rtc_32.h
+++ b/arch/sparc/include/asm/mc146818rtc_32.h
diff --git a/include/asm-sparc/mc146818rtc_64.h b/arch/sparc/include/asm/mc146818rtc_64.h
index e9c0fcc25c6f..e9c0fcc25c6f 100644
--- a/include/asm-sparc/mc146818rtc_64.h
+++ b/arch/sparc/include/asm/mc146818rtc_64.h
diff --git a/include/asm-sparc/mdesc.h b/arch/sparc/include/asm/mdesc.h
index 1acc7272e537..1acc7272e537 100644
--- a/include/asm-sparc/mdesc.h
+++ b/arch/sparc/include/asm/mdesc.h
diff --git a/include/asm-sparc/memreg.h b/arch/sparc/include/asm/memreg.h
index 845ad2b39183..845ad2b39183 100644
--- a/include/asm-sparc/memreg.h
+++ b/arch/sparc/include/asm/memreg.h
diff --git a/include/asm-sparc/mman.h b/arch/sparc/include/asm/mman.h
index fdfbbf0a4736..fdfbbf0a4736 100644
--- a/include/asm-sparc/mman.h
+++ b/arch/sparc/include/asm/mman.h
diff --git a/include/asm-sparc/mmu.h b/arch/sparc/include/asm/mmu.h
index ee66bf6dcbd6..88fa313887db 100644
--- a/include/asm-sparc/mmu.h
+++ b/arch/sparc/include/asm/mmu.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MMU_H
 #define ___ASM_SPARC_MMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_64.h>
+#include <asm/mmu_64.h>
 #else
-#include <asm-sparc/mmu_32.h>
+#include <asm/mmu_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/mmu_32.h b/arch/sparc/include/asm/mmu_32.h
index ccd36d26615a..ccd36d26615a 100644
--- a/include/asm-sparc/mmu_32.h
+++ b/arch/sparc/include/asm/mmu_32.h
diff --git a/include/asm-sparc/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
index 9067dc500535..9067dc500535 100644
--- a/include/asm-sparc/mmu_64.h
+++ b/arch/sparc/include/asm/mmu_64.h
diff --git a/include/asm-sparc/mmu_context.h b/arch/sparc/include/asm/mmu_context.h
index e14efb9532ff..5531346c64f9 100644
--- a/include/asm-sparc/mmu_context.h
+++ b/arch/sparc/include/asm/mmu_context.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MMU_CONTEXT_H
 #define ___ASM_SPARC_MMU_CONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_context_64.h>
+#include <asm/mmu_context_64.h>
 #else
-#include <asm-sparc/mmu_context_32.h>
+#include <asm/mmu_context_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h
index 671a997b9e69..671a997b9e69 100644
--- a/include/asm-sparc/mmu_context_32.h
+++ b/arch/sparc/include/asm/mmu_context_32.h
diff --git a/include/asm-sparc/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
index 5693ab482606..5693ab482606 100644
--- a/include/asm-sparc/mmu_context_64.h
+++ b/arch/sparc/include/asm/mmu_context_64.h
diff --git a/include/asm-sparc/mmzone.h b/arch/sparc/include/asm/mmzone.h
index ebf5986c12ed..ebf5986c12ed 100644
--- a/include/asm-sparc/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
diff --git a/include/asm-sparc/module.h b/arch/sparc/include/asm/module.h
index 516138fe681a..e82cf9a3e60e 100644
--- a/include/asm-sparc/module.h
+++ b/arch/sparc/include/asm/module.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MODULE_H
 #define ___ASM_SPARC_MODULE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/module_64.h>
+#include <asm/module_64.h>
 #else
-#include <asm-sparc/module_32.h>
+#include <asm/module_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/module_32.h b/arch/sparc/include/asm/module_32.h
index cbd9e67b0c0b..cbd9e67b0c0b 100644
--- a/include/asm-sparc/module_32.h
+++ b/arch/sparc/include/asm/module_32.h
diff --git a/include/asm-sparc/module_64.h b/arch/sparc/include/asm/module_64.h
index 3d77ba465783..3d77ba465783 100644
--- a/include/asm-sparc/module_64.h
+++ b/arch/sparc/include/asm/module_64.h
diff --git a/include/asm-sparc/mostek.h b/arch/sparc/include/asm/mostek.h
index 5b9f7fec7ee7..433be3e0a69b 100644
--- a/include/asm-sparc/mostek.h
+++ b/arch/sparc/include/asm/mostek.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MOSTEK_H
 #define ___ASM_SPARC_MOSTEK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mostek_64.h>
+#include <asm/mostek_64.h>
 #else
-#include <asm-sparc/mostek_32.h>
+#include <asm/mostek_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/mostek_32.h b/arch/sparc/include/asm/mostek_32.h
index a99590c4c507..a99590c4c507 100644
--- a/include/asm-sparc/mostek_32.h
+++ b/arch/sparc/include/asm/mostek_32.h
diff --git a/include/asm-sparc/mostek_64.h b/arch/sparc/include/asm/mostek_64.h
index c5652de2ace2..c5652de2ace2 100644
--- a/include/asm-sparc/mostek_64.h
+++ b/arch/sparc/include/asm/mostek_64.h
diff --git a/include/asm-sparc/mpmbox.h b/arch/sparc/include/asm/mpmbox.h
index f8423039b242..f8423039b242 100644
--- a/include/asm-sparc/mpmbox.h
+++ b/arch/sparc/include/asm/mpmbox.h
diff --git a/include/asm-sparc/msgbuf.h b/arch/sparc/include/asm/msgbuf.h
index efc7cbe9788f..efc7cbe9788f 100644
--- a/include/asm-sparc/msgbuf.h
+++ b/arch/sparc/include/asm/msgbuf.h
diff --git a/include/asm-sparc/msi.h b/arch/sparc/include/asm/msi.h
index 724ca5667052..724ca5667052 100644
--- a/include/asm-sparc/msi.h
+++ b/arch/sparc/include/asm/msi.h
diff --git a/include/asm-sparc/mutex.h b/arch/sparc/include/asm/mutex.h
index 458c1f7fbc18..458c1f7fbc18 100644
--- a/include/asm-sparc/mutex.h
+++ b/arch/sparc/include/asm/mutex.h
diff --git a/include/asm-sparc/mxcc.h b/arch/sparc/include/asm/mxcc.h
index c0517bd05bde..c0517bd05bde 100644
--- a/include/asm-sparc/mxcc.h
+++ b/arch/sparc/include/asm/mxcc.h
diff --git a/include/asm-sparc/ns87303.h b/arch/sparc/include/asm/ns87303.h
index 686defe6aaa0..686defe6aaa0 100644
--- a/include/asm-sparc/ns87303.h
+++ b/arch/sparc/include/asm/ns87303.h
diff --git a/include/asm-sparc/obio.h b/arch/sparc/include/asm/obio.h
index 1a7544ceb574..1a7544ceb574 100644
--- a/include/asm-sparc/obio.h
+++ b/arch/sparc/include/asm/obio.h
diff --git a/include/asm-sparc/of_device.h b/arch/sparc/include/asm/of_device.h
index e5f5aedc2293..e5f5aedc2293 100644
--- a/include/asm-sparc/of_device.h
+++ b/arch/sparc/include/asm/of_device.h
diff --git a/include/asm-sparc/of_platform.h b/arch/sparc/include/asm/of_platform.h
index 851eb84d737e..aa699775ffba 100644
--- a/include/asm-sparc/of_platform.h
+++ b/arch/sparc/include/asm/of_platform.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OF_PLATFORM_H
 #define ___ASM_SPARC_OF_PLATFORM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/of_platform_64.h>
+#include <asm/of_platform_64.h>
 #else
-#include <asm-sparc/of_platform_32.h>
+#include <asm/of_platform_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/of_platform_32.h b/arch/sparc/include/asm/of_platform_32.h
index 38334351c36b..723f7c9b7411 100644
--- a/include/asm-sparc/of_platform_32.h
+++ b/arch/sparc/include/asm/of_platform_32.h
@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *                       <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *              by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/include/asm-sparc/of_platform_64.h b/arch/sparc/include/asm/of_platform_64.h
index 78aa032b674c..4f66a5f6342d 100644
--- a/include/asm-sparc/of_platform_64.h
+++ b/arch/sparc/include/asm/of_platform_64.h
@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *                       <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *              by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/include/asm-sparc/openprom.h b/arch/sparc/include/asm/openprom.h
index 8c349f061994..aaeae905ed3f 100644
--- a/include/asm-sparc/openprom.h
+++ b/arch/sparc/include/asm/openprom.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OPENPROM_H
 #define ___ASM_SPARC_OPENPROM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/openprom_64.h>
+#include <asm/openprom_64.h>
 #else
-#include <asm-sparc/openprom_32.h>
+#include <asm/openprom_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/openprom_32.h b/arch/sparc/include/asm/openprom_32.h
index 8b1649f29ed9..8b1649f29ed9 100644
--- a/include/asm-sparc/openprom_32.h
+++ b/arch/sparc/include/asm/openprom_32.h
diff --git a/include/asm-sparc/openprom_64.h b/arch/sparc/include/asm/openprom_64.h
index b69e4a8c9170..b69e4a8c9170 100644
--- a/include/asm-sparc/openprom_64.h
+++ b/arch/sparc/include/asm/openprom_64.h
diff --git a/include/asm-sparc/openpromio.h b/arch/sparc/include/asm/openpromio.h
index 917fb8e9c633..917fb8e9c633 100644
--- a/include/asm-sparc/openpromio.h
+++ b/arch/sparc/include/asm/openpromio.h
diff --git a/include/asm-sparc/oplib.h b/arch/sparc/include/asm/oplib.h
index e88d7c04a292..72e04e13a6b4 100644
--- a/include/asm-sparc/oplib.h
+++ b/arch/sparc/include/asm/oplib.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OPLIB_H
 #define ___ASM_SPARC_OPLIB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/oplib_64.h>
+#include <asm/oplib_64.h>
 #else
-#include <asm-sparc/oplib_32.h>
+#include <asm/oplib_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index b2631da259e0..b2631da259e0 100644
--- a/include/asm-sparc/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
diff --git a/include/asm-sparc/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index 6d2c2ca98039..6d2c2ca98039 100644
--- a/include/asm-sparc/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h
index f32f49fcf75c..f21de0349025 100644
--- a/include/asm-sparc/page.h
+++ b/arch/sparc/include/asm/page.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PAGE_H
 #define ___ASM_SPARC_PAGE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/page_64.h>
+#include <asm/page_64.h>
 #else
-#include <asm-sparc/page_32.h>
+#include <asm/page_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/page_32.h b/arch/sparc/include/asm/page_32.h
index cf5fb70ca1c1..cf5fb70ca1c1 100644
--- a/include/asm-sparc/page_32.h
+++ b/arch/sparc/include/asm/page_32.h
diff --git a/include/asm-sparc/page_64.h b/arch/sparc/include/asm/page_64.h
index b579b910ef51..b579b910ef51 100644
--- a/include/asm-sparc/page_64.h
+++ b/arch/sparc/include/asm/page_64.h
diff --git a/include/asm-sparc/param.h b/arch/sparc/include/asm/param.h
index 9836d9a3cb9a..9836d9a3cb9a 100644
--- a/include/asm-sparc/param.h
+++ b/arch/sparc/include/asm/param.h
diff --git a/include/asm-sparc/parport.h b/arch/sparc/include/asm/parport.h
index 7818b2523b8d..7818b2523b8d 100644
--- a/include/asm-sparc/parport.h
+++ b/arch/sparc/include/asm/parport.h
diff --git a/include/asm-sparc/pbm.h b/arch/sparc/include/asm/pbm.h
index 458a4916d14d..458a4916d14d 100644
--- a/include/asm-sparc/pbm.h
+++ b/arch/sparc/include/asm/pbm.h
diff --git a/include/asm-sparc/pci.h b/arch/sparc/include/asm/pci.h
index b807d52a4809..6e14fd179335 100644
--- a/include/asm-sparc/pci.h
+++ b/arch/sparc/include/asm/pci.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PCI_H
 #define ___ASM_SPARC_PCI_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pci_64.h>
+#include <asm/pci_64.h>
 #else
-#include <asm-sparc/pci_32.h>
+#include <asm/pci_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/pci_32.h b/arch/sparc/include/asm/pci_32.h
index 0ee949d220c0..0ee949d220c0 100644
--- a/include/asm-sparc/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
diff --git a/include/asm-sparc/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 4f79a54948f6..4f79a54948f6 100644
--- a/include/asm-sparc/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
diff --git a/include/asm-sparc/pcic.h b/arch/sparc/include/asm/pcic.h
index f20ef562b265..f20ef562b265 100644
--- a/include/asm-sparc/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
diff --git a/include/asm-sparc/percpu.h b/arch/sparc/include/asm/percpu.h
index d98ed6cf2e36..bfb1d19ff1bf 100644
--- a/include/asm-sparc/percpu.h
+++ b/arch/sparc/include/asm/percpu.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PERCPU_H
 #define ___ASM_SPARC_PERCPU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/percpu_64.h>
+#include <asm/percpu_64.h>
 #else
-#include <asm-sparc/percpu_32.h>
+#include <asm/percpu_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/percpu_32.h b/arch/sparc/include/asm/percpu_32.h
index 06066a7aaec3..06066a7aaec3 100644
--- a/include/asm-sparc/percpu_32.h
+++ b/arch/sparc/include/asm/percpu_32.h
diff --git a/include/asm-sparc/percpu_64.h b/arch/sparc/include/asm/percpu_64.h
index bee64593023e..bee64593023e 100644
--- a/include/asm-sparc/percpu_64.h
+++ b/arch/sparc/include/asm/percpu_64.h
diff --git a/include/asm-sparc/perfctr.h b/arch/sparc/include/asm/perfctr.h
index 836873002b75..836873002b75 100644
--- a/include/asm-sparc/perfctr.h
+++ b/arch/sparc/include/asm/perfctr.h
diff --git a/include/asm-sparc/pgalloc.h b/arch/sparc/include/asm/pgalloc.h
index 7fa02b53d392..b6db1f7cdcab 100644
--- a/include/asm-sparc/pgalloc.h
+++ b/arch/sparc/include/asm/pgalloc.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PGALLOC_H
 #define ___ASM_SPARC_PGALLOC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgalloc_64.h>
+#include <asm/pgalloc_64.h>
 #else
-#include <asm-sparc/pgalloc_32.h>
+#include <asm/pgalloc_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
index 681582d26969..681582d26969 100644
--- a/include/asm-sparc/pgalloc_32.h
+++ b/arch/sparc/include/asm/pgalloc_32.h
diff --git a/include/asm-sparc/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
index 5bdfa2c6e400..5bdfa2c6e400 100644
--- a/include/asm-sparc/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
diff --git a/include/asm-sparc/pgtable.h b/arch/sparc/include/asm/pgtable.h
index 63cdef53bc52..59ba6f620732 100644
--- a/include/asm-sparc/pgtable.h
+++ b/arch/sparc/include/asm/pgtable.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PGTABLE_H
 #define ___ASM_SPARC_PGTABLE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgtable_64.h>
+#include <asm/pgtable_64.h>
 #else
-#include <asm-sparc/pgtable_32.h>
+#include <asm/pgtable_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 781bd4694a1c..08237fda8874 100644
--- a/include/asm-sparc/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -1,7 +1,7 @@
 #ifndef _SPARC_PGTABLE_H
 #define _SPARC_PGTABLE_H
 
-/*  asm-sparc/pgtable.h:  Defines and functions used to work
+/*  asm/pgtable.h:  Defines and functions used to work
  *                        with Sparc page tables.
  *
  *  Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index bb9ec2cce355..bb9ec2cce355 100644
--- a/include/asm-sparc/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
diff --git a/include/asm-sparc/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
index 808555fc1d58..808555fc1d58 100644
--- a/include/asm-sparc/pgtsrmmu.h
+++ b/arch/sparc/include/asm/pgtsrmmu.h
diff --git a/include/asm-sparc/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h
index 5a0d661fb82e..5a0d661fb82e 100644
--- a/include/asm-sparc/pgtsun4.h
+++ b/arch/sparc/include/asm/pgtsun4.h
diff --git a/include/asm-sparc/pgtsun4c.h b/arch/sparc/include/asm/pgtsun4c.h
index aeb25e912179..aeb25e912179 100644
--- a/include/asm-sparc/pgtsun4c.h
+++ b/arch/sparc/include/asm/pgtsun4c.h
diff --git a/include/asm-sparc/pil.h b/arch/sparc/include/asm/pil.h
index 71819bb943fc..71819bb943fc 100644
--- a/include/asm-sparc/pil.h
+++ b/arch/sparc/include/asm/pil.h
diff --git a/include/asm-sparc/poll.h b/arch/sparc/include/asm/poll.h
index 091d3ad2e830..091d3ad2e830 100644
--- a/include/asm-sparc/poll.h
+++ b/arch/sparc/include/asm/poll.h
diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h
index 58c820d75e83..03a0e091a884 100644
--- a/include/asm-sparc/posix_types.h
+++ b/arch/sparc/include/asm/posix_types.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_POSIX_TYPES_H
 #define ___ASM_SPARC_POSIX_TYPES_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/posix_types_64.h>
+#include <asm/posix_types_64.h>
 #else
-#include <asm-sparc/posix_types_32.h>
+#include <asm/posix_types_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/posix_types_32.h b/arch/sparc/include/asm/posix_types_32.h
index 6bb6eb1ca0f2..6bb6eb1ca0f2 100644
--- a/include/asm-sparc/posix_types_32.h
+++ b/arch/sparc/include/asm/posix_types_32.h
diff --git a/include/asm-sparc/posix_types_64.h b/arch/sparc/include/asm/posix_types_64.h
index ba8f93295763..ba8f93295763 100644
--- a/include/asm-sparc/posix_types_64.h
+++ b/arch/sparc/include/asm/posix_types_64.h
diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h
index 11a66bb02eaa..9da9646bf6c6 100644
--- a/include/asm-sparc/processor.h
+++ b/arch/sparc/include/asm/processor.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PROCESSOR_H
 #define ___ASM_SPARC_PROCESSOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/processor_64.h>
+#include <asm/processor_64.h>
 #else
-#include <asm-sparc/processor_32.h>
+#include <asm/processor_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/processor_32.h b/arch/sparc/include/asm/processor_32.h
index 562c0d69c537..2ae67a2e7f3a 100644
--- a/include/asm-sparc/processor_32.h
+++ b/arch/sparc/include/asm/processor_32.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/processor.h
+/* include/asm/processor.h
  *
  * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
  */
@@ -114,6 +114,7 @@ extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 
 extern unsigned long get_wchan(struct task_struct *);
 
+#define task_pt_regs(tsk) ((tsk)->thread.kregs)
 #define KSTK_EIP(tsk)  ((tsk)->thread.kregs->pc)
 #define KSTK_ESP(tsk)  ((tsk)->thread.kregs->u_regs[UREG_FP])
 
diff --git a/include/asm-sparc/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 70d42801a0d2..137a6bd72fc8 100644
--- a/include/asm-sparc/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/processor.h
+ * include/asm/processor.h
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h
index fd55522481cd..fd55522481cd 100644
--- a/include/asm-sparc/prom.h
+++ b/arch/sparc/include/asm/prom.h
diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h
index b8c0e5f0a66b..b8c0e5f0a66b 100644
--- a/include/asm-sparc/psr.h
+++ b/arch/sparc/include/asm/psr.h
diff --git a/include/asm-sparc/psrcompat.h b/arch/sparc/include/asm/psrcompat.h
index 44b6327dbbf5..44b6327dbbf5 100644
--- a/include/asm-sparc/psrcompat.h
+++ b/arch/sparc/include/asm/psrcompat.h
diff --git a/include/asm-sparc/pstate.h b/arch/sparc/include/asm/pstate.h
index a26a53777bb0..a26a53777bb0 100644
--- a/include/asm-sparc/pstate.h
+++ b/arch/sparc/include/asm/pstate.h
diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h
index f36ab6c30ff3..6dcbe2eed2e2 100644
--- a/include/asm-sparc/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PTRACE_H
 #define ___ASM_SPARC_PTRACE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ptrace_64.h>
+#include <asm/ptrace_64.h>
 #else
-#include <asm-sparc/ptrace_32.h>
+#include <asm/ptrace_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h
index 0401cc7ec38e..d43c88b86834 100644
--- a/include/asm-sparc/ptrace_32.h
+++ b/arch/sparc/include/asm/ptrace_32.h
@@ -74,6 +74,7 @@ struct sparc_stackf {
 
 #define user_mode(regs) (!((regs)->psr & PSR_PS))
 #define instruction_pointer(regs) ((regs)->pc)
+#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
 unsigned long profile_pc(struct pt_regs *);
 extern void show_regs(struct pt_regs *);
 #endif
diff --git a/include/asm-sparc/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h
index a682e66d5c4a..ec6d45c84cd0 100644
--- a/include/asm-sparc/ptrace_64.h
+++ b/arch/sparc/include/asm/ptrace_64.h
@@ -146,6 +146,7 @@ do {	current_thread_info()->syscall_noerror = 1; \
 } while (0)
 #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
 #define instruction_pointer(regs) ((regs)->tpc)
+#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
 #define regs_return_value(regs) ((regs)->u_regs[UREG_I0])
 #ifdef CONFIG_SMP
 extern unsigned long profile_pc(struct pt_regs *);
diff --git a/include/asm-sparc/reboot.h b/arch/sparc/include/asm/reboot.h
index 3f3f43f5be5e..3f3f43f5be5e 100644
--- a/include/asm-sparc/reboot.h
+++ b/arch/sparc/include/asm/reboot.h
diff --git a/include/asm-sparc/reg.h b/arch/sparc/include/asm/reg.h
index cb34b0a49aad..0c16e19cae4d 100644
--- a/include/asm-sparc/reg.h
+++ b/arch/sparc/include/asm/reg.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_REG_H
 #define ___ASM_SPARC_REG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/reg_64.h>
+#include <asm/reg_64.h>
 #else
-#include <asm-sparc/reg_32.h>
+#include <asm/reg_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/reg_32.h b/arch/sparc/include/asm/reg_32.h
index 42fecfcd97e7..1efb056fb3d1 100644
--- a/include/asm-sparc/reg_32.h
+++ b/arch/sparc/include/asm/reg_32.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc/reg.h
+ * linux/include/asm/reg.h
  * Layout of the registers as expected by gdb on the Sparc
  * we should replace the user.h definitions with those in
  * this file, we don't even use the other
diff --git a/include/asm-sparc/reg_64.h b/arch/sparc/include/asm/reg_64.h
index eb24a07ff4d5..6f277d7c7d88 100644
--- a/include/asm-sparc/reg_64.h
+++ b/arch/sparc/include/asm/reg_64.h
@@ -1,5 +1,5 @@
 /*
- * linux/asm-sparc64/reg.h
+ * linux/asm/reg.h
  * Layout of the registers as expected by gdb on the Sparc
  * we should replace the user.h definitions with those in
  * this file, we don't even use the other
diff --git a/include/asm-sparc/resource.h b/arch/sparc/include/asm/resource.h
index fe163cafb4c7..fe163cafb4c7 100644
--- a/include/asm-sparc/resource.h
+++ b/arch/sparc/include/asm/resource.h
diff --git a/include/asm-sparc/ross.h b/arch/sparc/include/asm/ross.h
index ecb6e81786a6..ecb6e81786a6 100644
--- a/include/asm-sparc/ross.h
+++ b/arch/sparc/include/asm/ross.h
diff --git a/include/asm-sparc/rtc.h b/arch/sparc/include/asm/rtc.h
index f9ecb1fe2ecd..f9ecb1fe2ecd 100644
--- a/include/asm-sparc/rtc.h
+++ b/arch/sparc/include/asm/rtc.h
diff --git a/include/asm-sparc/rwsem-const.h b/arch/sparc/include/asm/rwsem-const.h
index a303c9d64d84..a303c9d64d84 100644
--- a/include/asm-sparc/rwsem-const.h
+++ b/arch/sparc/include/asm/rwsem-const.h
diff --git a/include/asm-sparc/rwsem.h b/arch/sparc/include/asm/rwsem.h
index 1dc129ac2feb..1dc129ac2feb 100644
--- a/include/asm-sparc/rwsem.h
+++ b/arch/sparc/include/asm/rwsem.h
diff --git a/include/asm-sparc/sbi.h b/arch/sparc/include/asm/sbi.h
index 5eb7f1965d33..5eb7f1965d33 100644
--- a/include/asm-sparc/sbi.h
+++ b/arch/sparc/include/asm/sbi.h
diff --git a/include/asm-sparc/sbus.h b/arch/sparc/include/asm/sbus.h
index 8f29a1979665..f82481ab44db 100644
--- a/include/asm-sparc/sbus.h
+++ b/arch/sparc/include/asm/sbus.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SBUS_H
 #define ___ASM_SPARC_SBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sbus_64.h>
+#include <asm/sbus_64.h>
 #else
-#include <asm-sparc/sbus_32.h>
+#include <asm/sbus_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/sbus_32.h b/arch/sparc/include/asm/sbus_32.h
index 77b5d3aadc99..77b5d3aadc99 100644
--- a/include/asm-sparc/sbus_32.h
+++ b/arch/sparc/include/asm/sbus_32.h
diff --git a/include/asm-sparc/sbus_64.h b/arch/sparc/include/asm/sbus_64.h
index 0e16b6dd7e96..0e16b6dd7e96 100644
--- a/include/asm-sparc/sbus_64.h
+++ b/arch/sparc/include/asm/sbus_64.h
diff --git a/include/asm-sparc/scatterlist.h b/arch/sparc/include/asm/scatterlist.h
index b1a0e316c2b6..ec21a4517641 100644
--- a/include/asm-sparc/scatterlist.h
+++ b/arch/sparc/include/asm/scatterlist.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SCATTERLIST_H
 #define ___ASM_SPARC_SCATTERLIST_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/scatterlist_64.h>
+#include <asm/scatterlist_64.h>
 #else
-#include <asm-sparc/scatterlist_32.h>
+#include <asm/scatterlist_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/scatterlist_32.h b/arch/sparc/include/asm/scatterlist_32.h
index c82609ca1d0f..c82609ca1d0f 100644
--- a/include/asm-sparc/scatterlist_32.h
+++ b/arch/sparc/include/asm/scatterlist_32.h
diff --git a/include/asm-sparc/scatterlist_64.h b/arch/sparc/include/asm/scatterlist_64.h
index 81bd058f9382..81bd058f9382 100644
--- a/include/asm-sparc/scatterlist_64.h
+++ b/arch/sparc/include/asm/scatterlist_64.h
diff --git a/include/asm-sparc/scratchpad.h b/arch/sparc/include/asm/scratchpad.h
index 5e8b01fb3343..5e8b01fb3343 100644
--- a/include/asm-sparc/scratchpad.h
+++ b/arch/sparc/include/asm/scratchpad.h
diff --git a/include/asm-sparc/seccomp.h b/arch/sparc/include/asm/seccomp.h
index 7fcd9968192b..7fcd9968192b 100644
--- a/include/asm-sparc/seccomp.h
+++ b/arch/sparc/include/asm/seccomp.h
diff --git a/include/asm-sparc/sections.h b/arch/sparc/include/asm/sections.h
index cbd019162425..c7c69b00967f 100644
--- a/include/asm-sparc/sections.h
+++ b/arch/sparc/include/asm/sections.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SECTIONS_H
 #define ___ASM_SPARC_SECTIONS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sections_64.h>
+#include <asm/sections_64.h>
 #else
-#include <asm-sparc/sections_32.h>
+#include <asm/sections_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/sections_32.h b/arch/sparc/include/asm/sections_32.h
index 6832841df051..6832841df051 100644
--- a/include/asm-sparc/sections_32.h
+++ b/arch/sparc/include/asm/sections_32.h
diff --git a/include/asm-sparc/sections_64.h b/arch/sparc/include/asm/sections_64.h
index 3f4b9fdc28d0..3f4b9fdc28d0 100644
--- a/include/asm-sparc/sections_64.h
+++ b/arch/sparc/include/asm/sections_64.h
diff --git a/include/asm-sparc/sembuf.h b/arch/sparc/include/asm/sembuf.h
index faee1be08d67..faee1be08d67 100644
--- a/include/asm-sparc/sembuf.h
+++ b/arch/sparc/include/asm/sembuf.h
diff --git a/include/asm-sparc/setup.h b/arch/sparc/include/asm/setup.h
index 2643c62f4ac0..2643c62f4ac0 100644
--- a/include/asm-sparc/setup.h
+++ b/arch/sparc/include/asm/setup.h
diff --git a/include/asm-sparc/sfafsr.h b/arch/sparc/include/asm/sfafsr.h
index e96137b04a4f..e96137b04a4f 100644
--- a/include/asm-sparc/sfafsr.h
+++ b/arch/sparc/include/asm/sfafsr.h
diff --git a/include/asm-sparc/sfp-machine.h b/arch/sparc/include/asm/sfp-machine.h
index c676fcc2dd27..4ebc3823ed4f 100644
--- a/include/asm-sparc/sfp-machine.h
+++ b/arch/sparc/include/asm/sfp-machine.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SFP_MACHINE_H
 #define ___ASM_SPARC_SFP_MACHINE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sfp-machine_64.h>
+#include <asm/sfp-machine_64.h>
 #else
-#include <asm-sparc/sfp-machine_32.h>
+#include <asm/sfp-machine_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/sfp-machine_32.h b/arch/sparc/include/asm/sfp-machine_32.h
index 01d9c3b5a73b..01d9c3b5a73b 100644
--- a/include/asm-sparc/sfp-machine_32.h
+++ b/arch/sparc/include/asm/sfp-machine_32.h
diff --git a/include/asm-sparc/sfp-machine_64.h b/arch/sparc/include/asm/sfp-machine_64.h
index ca913ef40bd5..ca913ef40bd5 100644
--- a/include/asm-sparc/sfp-machine_64.h
+++ b/arch/sparc/include/asm/sfp-machine_64.h
diff --git a/include/asm-sparc/shmbuf.h b/arch/sparc/include/asm/shmbuf.h
index 83a16055363f..83a16055363f 100644
--- a/include/asm-sparc/shmbuf.h
+++ b/arch/sparc/include/asm/shmbuf.h
diff --git a/include/asm-sparc/shmparam.h b/arch/sparc/include/asm/shmparam.h
index 16fda7e9acc8..8bf0cfe0694f 100644
--- a/include/asm-sparc/shmparam.h
+++ b/arch/sparc/include/asm/shmparam.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SHMPARAM_H
 #define ___ASM_SPARC_SHMPARAM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/shmparam_64.h>
+#include <asm/shmparam_64.h>
 #else
-#include <asm-sparc/shmparam_32.h>
+#include <asm/shmparam_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/shmparam_32.h b/arch/sparc/include/asm/shmparam_32.h
index 59a1243c12f3..59a1243c12f3 100644
--- a/include/asm-sparc/shmparam_32.h
+++ b/arch/sparc/include/asm/shmparam_32.h
diff --git a/include/asm-sparc/shmparam_64.h b/arch/sparc/include/asm/shmparam_64.h
index 1ed0d6701a9b..1ed0d6701a9b 100644
--- a/include/asm-sparc/shmparam_64.h
+++ b/arch/sparc/include/asm/shmparam_64.h
diff --git a/include/asm-sparc/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
index 82fc7d54a4fa..e92de7e286b5 100644
--- a/include/asm-sparc/sigcontext.h
+++ b/arch/sparc/include/asm/sigcontext.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGCONTEXT_H
 #define ___ASM_SPARC_SIGCONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sigcontext_64.h>
+#include <asm/sigcontext_64.h>
 #else
-#include <asm-sparc/sigcontext_32.h>
+#include <asm/sigcontext_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/sigcontext_32.h b/arch/sparc/include/asm/sigcontext_32.h
index c5fb60dcbd75..c5fb60dcbd75 100644
--- a/include/asm-sparc/sigcontext_32.h
+++ b/arch/sparc/include/asm/sigcontext_32.h
diff --git a/include/asm-sparc/sigcontext_64.h b/arch/sparc/include/asm/sigcontext_64.h
index 1c868d680cfc..1c868d680cfc 100644
--- a/include/asm-sparc/sigcontext_64.h
+++ b/arch/sparc/include/asm/sigcontext_64.h
diff --git a/include/asm-sparc/siginfo.h b/arch/sparc/include/asm/siginfo.h
index 2c9fccf4ce18..bd81f8d7f5ce 100644
--- a/include/asm-sparc/siginfo.h
+++ b/arch/sparc/include/asm/siginfo.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGINFO_H
 #define ___ASM_SPARC_SIGINFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/siginfo_64.h>
+#include <asm/siginfo_64.h>
 #else
-#include <asm-sparc/siginfo_32.h>
+#include <asm/siginfo_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/siginfo_32.h b/arch/sparc/include/asm/siginfo_32.h
index 3c71af135c52..3c71af135c52 100644
--- a/include/asm-sparc/siginfo_32.h
+++ b/arch/sparc/include/asm/siginfo_32.h
diff --git a/include/asm-sparc/siginfo_64.h b/arch/sparc/include/asm/siginfo_64.h
index c96e6c30f8b0..c96e6c30f8b0 100644
--- a/include/asm-sparc/siginfo_64.h
+++ b/arch/sparc/include/asm/siginfo_64.h
diff --git a/include/asm-sparc/signal.h b/arch/sparc/include/asm/signal.h
index 36f5f9e482f7..27ab05dc203e 100644
--- a/include/asm-sparc/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGNAL_H
 #define ___ASM_SPARC_SIGNAL_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/signal_64.h>
+#include <asm/signal_64.h>
 #else
-#include <asm-sparc/signal_32.h>
+#include <asm/signal_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/signal_32.h b/arch/sparc/include/asm/signal_32.h
index 96a60ab03ca1..96a60ab03ca1 100644
--- a/include/asm-sparc/signal_32.h
+++ b/arch/sparc/include/asm/signal_32.h
diff --git a/include/asm-sparc/signal_64.h b/arch/sparc/include/asm/signal_64.h
index ab1509a101c5..ab1509a101c5 100644
--- a/include/asm-sparc/signal_64.h
+++ b/arch/sparc/include/asm/signal_64.h
diff --git a/include/asm-sparc/smp.h b/arch/sparc/include/asm/smp.h
index 1f9dedfbabd8..b59672d0e19b 100644
--- a/include/asm-sparc/smp.h
+++ b/arch/sparc/include/asm/smp.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SMP_H
 #define ___ASM_SPARC_SMP_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/smp_64.h>
+#include <asm/smp_64.h>
 #else
-#include <asm-sparc/smp_32.h>
+#include <asm/smp_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/smp_32.h b/arch/sparc/include/asm/smp_32.h
index 7201752cf934..7201752cf934 100644
--- a/include/asm-sparc/smp_32.h
+++ b/arch/sparc/include/asm/smp_32.h
diff --git a/include/asm-sparc/smp_64.h b/arch/sparc/include/asm/smp_64.h
index 57224dd37b3a..57224dd37b3a 100644
--- a/include/asm-sparc/smp_64.h
+++ b/arch/sparc/include/asm/smp_64.h
diff --git a/include/asm-sparc/smpprim.h b/arch/sparc/include/asm/smpprim.h
index eb849d862c64..eb849d862c64 100644
--- a/include/asm-sparc/smpprim.h
+++ b/arch/sparc/include/asm/smpprim.h
diff --git a/include/asm-sparc/socket.h b/arch/sparc/include/asm/socket.h
index bf50d0c2d583..bf50d0c2d583 100644
--- a/include/asm-sparc/socket.h
+++ b/arch/sparc/include/asm/socket.h
diff --git a/include/asm-sparc/sockios.h b/arch/sparc/include/asm/sockios.h
index 990ea746486b..990ea746486b 100644
--- a/include/asm-sparc/sockios.h
+++ b/arch/sparc/include/asm/sockios.h
diff --git a/include/asm-sparc/sparsemem.h b/arch/sparc/include/asm/sparsemem.h
index b99d4e4b6d28..b99d4e4b6d28 100644
--- a/include/asm-sparc/sparsemem.h
+++ b/arch/sparc/include/asm/sparsemem.h
diff --git a/include/asm-sparc/spinlock.h b/arch/sparc/include/asm/spinlock.h
index 3b71c50b72eb..f276b0036b2c 100644
--- a/include/asm-sparc/spinlock.h
+++ b/arch/sparc/include/asm/spinlock.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SPINLOCK_H
 #define ___ASM_SPARC_SPINLOCK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/spinlock_64.h>
+#include <asm/spinlock_64.h>
 #else
-#include <asm-sparc/spinlock_32.h>
+#include <asm/spinlock_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index de2249b267c6..de2249b267c6 100644
--- a/include/asm-sparc/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
diff --git a/include/asm-sparc/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index 0006fe9f8c7a..0006fe9f8c7a 100644
--- a/include/asm-sparc/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
diff --git a/include/asm-sparc/spinlock_types.h b/arch/sparc/include/asm/spinlock_types.h
index 37cbe01c585b..37cbe01c585b 100644
--- a/include/asm-sparc/spinlock_types.h
+++ b/arch/sparc/include/asm/spinlock_types.h
diff --git a/include/asm-sparc/spitfire.h b/arch/sparc/include/asm/spitfire.h
index 985ea7e31992..985ea7e31992 100644
--- a/include/asm-sparc/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
diff --git a/include/asm-sparc/sstate.h b/arch/sparc/include/asm/sstate.h
index a7c35dbcb281..a7c35dbcb281 100644
--- a/include/asm-sparc/sstate.h
+++ b/arch/sparc/include/asm/sstate.h
diff --git a/include/asm-sparc/stacktrace.h b/arch/sparc/include/asm/stacktrace.h
index 6cee39adf6d6..6cee39adf6d6 100644
--- a/include/asm-sparc/stacktrace.h
+++ b/arch/sparc/include/asm/stacktrace.h
diff --git a/include/asm-sparc/starfire.h b/arch/sparc/include/asm/starfire.h
index 07bafd31e33c..07bafd31e33c 100644
--- a/include/asm-sparc/starfire.h
+++ b/arch/sparc/include/asm/starfire.h
diff --git a/include/asm-sparc/stat.h b/arch/sparc/include/asm/stat.h
index 9fdcaf8c9cd3..d8153013df72 100644
--- a/include/asm-sparc/stat.h
+++ b/arch/sparc/include/asm/stat.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STAT_H
 #define ___ASM_SPARC_STAT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/stat_64.h>
+#include <asm/stat_64.h>
 #else
-#include <asm-sparc/stat_32.h>
+#include <asm/stat_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/stat_32.h b/arch/sparc/include/asm/stat_32.h
index 2299e1d5d94c..2299e1d5d94c 100644
--- a/include/asm-sparc/stat_32.h
+++ b/arch/sparc/include/asm/stat_32.h
diff --git a/include/asm-sparc/stat_64.h b/arch/sparc/include/asm/stat_64.h
index 9650fdea847f..9650fdea847f 100644
--- a/include/asm-sparc/stat_64.h
+++ b/arch/sparc/include/asm/stat_64.h
diff --git a/include/asm-sparc/statfs.h b/arch/sparc/include/asm/statfs.h
index a70cc52e7018..5e937a73743d 100644
--- a/include/asm-sparc/statfs.h
+++ b/arch/sparc/include/asm/statfs.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STATFS_H
 #define ___ASM_SPARC_STATFS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/statfs_64.h>
+#include <asm/statfs_64.h>
 #else
-#include <asm-sparc/statfs_32.h>
+#include <asm/statfs_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/statfs_32.h b/arch/sparc/include/asm/statfs_32.h
index 304520fa8863..304520fa8863 100644
--- a/include/asm-sparc/statfs_32.h
+++ b/arch/sparc/include/asm/statfs_32.h
diff --git a/include/asm-sparc/statfs_64.h b/arch/sparc/include/asm/statfs_64.h
index 79b3c890a5fa..79b3c890a5fa 100644
--- a/include/asm-sparc/statfs_64.h
+++ b/arch/sparc/include/asm/statfs_64.h
diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h
index 14c04c7697a5..98b72a0c8e6e 100644
--- a/include/asm-sparc/string.h
+++ b/arch/sparc/include/asm/string.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STRING_H
 #define ___ASM_SPARC_STRING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/string_64.h>
+#include <asm/string_64.h>
 #else
-#include <asm-sparc/string_32.h>
+#include <asm/string_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/string_32.h b/arch/sparc/include/asm/string_32.h
index 6c5fddb7e6b5..6c5fddb7e6b5 100644
--- a/include/asm-sparc/string_32.h
+++ b/arch/sparc/include/asm/string_32.h
diff --git a/include/asm-sparc/string_64.h b/arch/sparc/include/asm/string_64.h
index 43161f2d17eb..43161f2d17eb 100644
--- a/include/asm-sparc/string_64.h
+++ b/arch/sparc/include/asm/string_64.h
diff --git a/include/asm-sparc/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h
index d52985f19f42..d52985f19f42 100644
--- a/include/asm-sparc/sun4paddr.h
+++ b/arch/sparc/include/asm/sun4paddr.h
diff --git a/include/asm-sparc/sun4prom.h b/arch/sparc/include/asm/sun4prom.h
index 9c8b4cbf629a..9c8b4cbf629a 100644
--- a/include/asm-sparc/sun4prom.h
+++ b/arch/sparc/include/asm/sun4prom.h
diff --git a/include/asm-sparc/sunbpp.h b/arch/sparc/include/asm/sunbpp.h
index 92ee1a8ff3a2..d81a02eaf78b 100644
--- a/include/asm-sparc/sunbpp.h
+++ b/arch/sparc/include/asm/sunbpp.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/sunbpp.h
+ * include/asm/sunbpp.h
  */
 
 #ifndef _ASM_SPARC_SUNBPP_H
diff --git a/include/asm-sparc/swift.h b/arch/sparc/include/asm/swift.h
index e535061bf755..e535061bf755 100644
--- a/include/asm-sparc/swift.h
+++ b/arch/sparc/include/asm/swift.h
diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
new file mode 100644
index 000000000000..7486c605e23c
--- /dev/null
+++ b/arch/sparc/include/asm/syscall.h
@@ -0,0 +1,120 @@
+#ifndef __ASM_SPARC_SYSCALL_H
+#define __ASM_SPARC_SYSCALL_H
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <asm/ptrace.h>
+
+/* The system call number is given by the user in %g1 */
+static inline long syscall_get_nr(struct task_struct *task,
+                                  struct pt_regs *regs)
+{
+        int syscall_p = pt_regs_is_syscall(regs);
+
+        return (syscall_p ? regs->u_regs[UREG_G1] : -1L);
+}
+
+static inline void syscall_rollback(struct task_struct *task,
+                                    struct pt_regs *regs)
+{
+        /* XXX This needs some thought.  On Sparc we don't
+         * XXX save away the original %o0 value somewhere.
+         * XXX Instead we hold it in register %l5 at the top
+         * XXX level trap frame and pass this down to the signal
+         * XXX dispatch code which is the only place that value
+         * XXX ever was needed.
+         */
+}
+
+#ifdef CONFIG_SPARC32
+static inline bool syscall_has_error(struct pt_regs *regs)
+{
+        return (regs->psr & PSR_C) ? true : false;
+}
+static inline void syscall_set_error(struct pt_regs *regs)
+{
+        regs->psr |= PSR_C;
+}
+static inline void syscall_clear_error(struct pt_regs *regs)
+{
+        regs->psr &= ~PSR_C;
+}
+#else
+static inline bool syscall_has_error(struct pt_regs *regs)
+{
+        return (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY)) ? true : false;
+}
+static inline void syscall_set_error(struct pt_regs *regs)
+{
+        regs->tstate |= (TSTATE_XCARRY | TSTATE_ICARRY);
+}
+static inline void syscall_clear_error(struct pt_regs *regs)
+{
+        regs->tstate &= ~(TSTATE_XCARRY | TSTATE_ICARRY);
+}
+#endif
+
+static inline long syscall_get_error(struct task_struct *task,
+                                     struct pt_regs *regs)
+{
+        long val = regs->u_regs[UREG_I0];
+
+        return (syscall_has_error(regs) ? -val : 0);
+}
+
+static inline long syscall_get_return_value(struct task_struct *task,
+                                            struct pt_regs *regs)
+{
+        long val = regs->u_regs[UREG_I0];
+
+        return val;
+}
+
+static inline void syscall_set_return_value(struct task_struct *task,
+                                            struct pt_regs *regs,
+                                            int error, long val)
+{
+        if (error) {
+                syscall_set_error(regs);
+                regs->u_regs[UREG_I0] = -error;
+        } else {
+                syscall_clear_error(regs);
+                regs->u_regs[UREG_I0] = val;
+        }
+}
+
+static inline void syscall_get_arguments(struct task_struct *task,
+                                         struct pt_regs *regs,
+                                         unsigned int i, unsigned int n,
+                                         unsigned long *args)
+{
+        int zero_extend = 0;
+        unsigned int j;
+
+#ifdef CONFIG_SPARC64
+        if (test_tsk_thread_flag(task, TIF_32BIT))
+                zero_extend = 1;
+#endif
+
+        for (j = 0; j < n; j++) {
+                unsigned long val = regs->u_regs[UREG_I0 + i + j];
+
+                if (zero_extend)
+                        args[j] = (u32) val;
+                else
+                        args[j] = val;
+        }
+}
+
+static inline void syscall_set_arguments(struct task_struct *task,
+                                         struct pt_regs *regs,
+                                         unsigned int i, unsigned int n,
+                                         const unsigned long *args)
+{
+        unsigned int j;
+
+        for (j = 0; j < n; j++)
+                regs->u_regs[UREG_I0 + i + j] = args[j];
+}
+
+#endif /* __ASM_SPARC_SYSCALL_H */
diff --git a/include/asm-sparc/syscalls.h b/arch/sparc/include/asm/syscalls.h
index 45a43f637a14..45a43f637a14 100644
--- a/include/asm-sparc/syscalls.h
+++ b/arch/sparc/include/asm/syscalls.h
diff --git a/include/asm-sparc/sysen.h b/arch/sparc/include/asm/sysen.h
index 6af34abde6e7..6af34abde6e7 100644
--- a/include/asm-sparc/sysen.h
+++ b/arch/sparc/include/asm/sysen.h
diff --git a/include/asm-sparc/system.h b/arch/sparc/include/asm/system.h
index 15e2a3bc4f61..7944a7cfc996 100644
--- a/include/asm-sparc/system.h
+++ b/arch/sparc/include/asm/system.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SYSTEM_H
 #define ___ASM_SPARC_SYSTEM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/system_64.h>
+#include <asm/system_64.h>
 #else
-#include <asm-sparc/system_32.h>
+#include <asm/system_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/system_32.h b/arch/sparc/include/asm/system_32.h
index b4b024445fc9..b4b024445fc9 100644
--- a/include/asm-sparc/system_32.h
+++ b/arch/sparc/include/asm/system_32.h
diff --git a/include/asm-sparc/system_64.h b/arch/sparc/include/asm/system_64.h
index db9e742a406a..db9e742a406a 100644
--- a/include/asm-sparc/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
diff --git a/include/asm-sparc/termbits.h b/arch/sparc/include/asm/termbits.h
index d6ca3e2754f5..d6ca3e2754f5 100644
--- a/include/asm-sparc/termbits.h
+++ b/arch/sparc/include/asm/termbits.h
diff --git a/include/asm-sparc/termios.h b/arch/sparc/include/asm/termios.h
index e8ba95399643..e8ba95399643 100644
--- a/include/asm-sparc/termios.h
+++ b/arch/sparc/include/asm/termios.h
diff --git a/include/asm-sparc/thread_info.h b/arch/sparc/include/asm/thread_info.h
index 64155cf89f37..122d7acc07e6 100644
--- a/include/asm-sparc/thread_info.h
+++ b/arch/sparc/include/asm/thread_info.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_THREAD_INFO_H
 #define ___ASM_SPARC_THREAD_INFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/thread_info_64.h>
+#include <asm/thread_info_64.h>
 #else
-#include <asm-sparc/thread_info_32.h>
+#include <asm/thread_info_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index 2cf9db044055..cbb892d0dff0 100644
--- a/include/asm-sparc/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -130,7 +130,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-/* flag bit 1 is available */
+#define TIF_NOTIFY_RESUME       1       /* callback before returning to user */
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_RESTORE_SIGMASK     4       /* restore signal mask in do_signal() */
@@ -142,12 +142,17 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
+#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 
+#define _TIF_DO_NOTIFY_RESUME_MASK      (_TIF_NOTIFY_RESUME | \
+                                         _TIF_SIGPENDING | \
+                                         _TIF_RESTORE_SIGMASK)
+
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-sparc/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 960969d5ad06..c0a737d7292c 100644
--- a/include/asm-sparc/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -219,7 +219,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
  *       nop
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-/* flags bit 1 is available */
+#define TIF_NOTIFY_RESUME       1       /* callback before returning to user */
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_PERFCTR             4       /* performance counters active */
@@ -239,6 +239,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define TIF_POLLING_NRFLAG      14
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
+#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_PERFCTR            (1<<TIF_PERFCTR)
@@ -250,8 +251,9 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 
 #define _TIF_USER_WORK_MASK     ((0xff << TI_FLAG_WSAVED_SHIFT) | \
-                                 (_TIF_SIGPENDING | \
-                                  _TIF_NEED_RESCHED | _TIF_PERFCTR))
+                                 _TIF_DO_NOTIFY_RESUME_MASK | \
+                                 _TIF_NEED_RESCHED | _TIF_PERFCTR)
+#define _TIF_DO_NOTIFY_RESUME_MASK      (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
 
 /*
  * Thread-synchronous status.
diff --git a/include/asm-sparc/timer.h b/arch/sparc/include/asm/timer.h
index 475baa05a96e..612fd2779d9e 100644
--- a/include/asm-sparc/timer.h
+++ b/arch/sparc/include/asm/timer.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TIMER_H
 #define ___ASM_SPARC_TIMER_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timer_64.h>
+#include <asm/timer_64.h>
 #else
-#include <asm-sparc/timer_32.h>
+#include <asm/timer_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/timer_32.h b/arch/sparc/include/asm/timer_32.h
index 361e53898dd7..361e53898dd7 100644
--- a/include/asm-sparc/timer_32.h
+++ b/arch/sparc/include/asm/timer_32.h
diff --git a/include/asm-sparc/timer_64.h b/arch/sparc/include/asm/timer_64.h
index 5b779fd1f788..5b779fd1f788 100644
--- a/include/asm-sparc/timer_64.h
+++ b/arch/sparc/include/asm/timer_64.h
diff --git a/include/asm-sparc/timex.h b/arch/sparc/include/asm/timex.h
index 01d9f199d452..70cc37b73827 100644
--- a/include/asm-sparc/timex.h
+++ b/arch/sparc/include/asm/timex.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TIMEX_H
 #define ___ASM_SPARC_TIMEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timex_64.h>
+#include <asm/timex_64.h>
 #else
-#include <asm-sparc/timex_32.h>
+#include <asm/timex_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/timex_32.h b/arch/sparc/include/asm/timex_32.h
index 71b45c90ccae..b6ccdb0d6f7d 100644
--- a/include/asm-sparc/timex_32.h
+++ b/arch/sparc/include/asm/timex_32.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc architecture timex specifications
  */
diff --git a/include/asm-sparc/timex_64.h b/arch/sparc/include/asm/timex_64.h
index c622535c4560..18b30bc9823b 100644
--- a/include/asm-sparc/timex_64.h
+++ b/arch/sparc/include/asm/timex_64.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc64/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc64 architecture timex specifications
  */
diff --git a/include/asm-sparc/tlb.h b/arch/sparc/include/asm/tlb.h
index a821057327c4..92d0393bbcdc 100644
--- a/include/asm-sparc/tlb.h
+++ b/arch/sparc/include/asm/tlb.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TLB_H
 #define ___ASM_SPARC_TLB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlb_64.h>
+#include <asm/tlb_64.h>
 #else
-#include <asm-sparc/tlb_32.h>
+#include <asm/tlb_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
index 6d02d1ce53f3..6d02d1ce53f3 100644
--- a/include/asm-sparc/tlb_32.h
+++ b/arch/sparc/include/asm/tlb_32.h
diff --git a/include/asm-sparc/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index ec81cdedef2c..ec81cdedef2c 100644
--- a/include/asm-sparc/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
diff --git a/include/asm-sparc/tlbflush.h b/arch/sparc/include/asm/tlbflush.h
index 6e6bc12227b8..2c9629fad1e2 100644
--- a/include/asm-sparc/tlbflush.h
+++ b/arch/sparc/include/asm/tlbflush.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TLBFLUSH_H
 #define ___ASM_SPARC_TLBFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlbflush_64.h>
+#include <asm/tlbflush_64.h>
 #else
-#include <asm-sparc/tlbflush_32.h>
+#include <asm/tlbflush_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/tlbflush_32.h b/arch/sparc/include/asm/tlbflush_32.h
index fe0a71abc9bb..fe0a71abc9bb 100644
--- a/include/asm-sparc/tlbflush_32.h
+++ b/arch/sparc/include/asm/tlbflush_32.h
diff --git a/include/asm-sparc/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h
index fbb675dbe0c9..fbb675dbe0c9 100644
--- a/include/asm-sparc/tlbflush_64.h
+++ b/arch/sparc/include/asm/tlbflush_64.h
diff --git a/include/asm-sparc/topology.h b/arch/sparc/include/asm/topology.h
index ed13630f32e2..ee4f191d394a 100644
--- a/include/asm-sparc/topology.h
+++ b/arch/sparc/include/asm/topology.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TOPOLOGY_H
 #define ___ASM_SPARC_TOPOLOGY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/topology_64.h>
+#include <asm/topology_64.h>
 #else
-#include <asm-sparc/topology_32.h>
+#include <asm/topology_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/topology_32.h b/arch/sparc/include/asm/topology_32.h
index ee5ac9c9da28..ee5ac9c9da28 100644
--- a/include/asm-sparc/topology_32.h
+++ b/arch/sparc/include/asm/topology_32.h
diff --git a/include/asm-sparc/topology_64.h b/arch/sparc/include/asm/topology_64.h
index 001c04027c82..001c04027c82 100644
--- a/include/asm-sparc/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
diff --git a/include/asm-sparc/traps.h b/arch/sparc/include/asm/traps.h
index bebdbf8f43a8..bebdbf8f43a8 100644
--- a/include/asm-sparc/traps.h
+++ b/arch/sparc/include/asm/traps.h
diff --git a/include/asm-sparc/tsb.h b/arch/sparc/include/asm/tsb.h
index 76e4299dd9bc..76e4299dd9bc 100644
--- a/include/asm-sparc/tsb.h
+++ b/arch/sparc/include/asm/tsb.h
diff --git a/include/asm-sparc/tsunami.h b/arch/sparc/include/asm/tsunami.h
index 5bbd1d523baa..5bbd1d523baa 100644
--- a/include/asm-sparc/tsunami.h
+++ b/arch/sparc/include/asm/tsunami.h
diff --git a/include/asm-sparc/ttable.h b/arch/sparc/include/asm/ttable.h
index 5708ba2719fb..5708ba2719fb 100644
--- a/include/asm-sparc/ttable.h
+++ b/arch/sparc/include/asm/ttable.h
diff --git a/include/asm-sparc/turbosparc.h b/arch/sparc/include/asm/turbosparc.h
index 17c73282db0a..17c73282db0a 100644
--- a/include/asm-sparc/turbosparc.h
+++ b/arch/sparc/include/asm/turbosparc.h
diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h
index 8c28fde5eaa2..8c28fde5eaa2 100644
--- a/include/asm-sparc/types.h
+++ b/arch/sparc/include/asm/types.h
diff --git a/include/asm-sparc/uaccess.h b/arch/sparc/include/asm/uaccess.h
index 424facce5238..e88fbe5c0457 100644
--- a/include/asm-sparc/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_UACCESS_H
 #define ___ASM_SPARC_UACCESS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/uaccess_64.h>
+#include <asm/uaccess_64.h>
 #else
-#include <asm-sparc/uaccess_32.h>
+#include <asm/uaccess_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 47d5619d43fa..47d5619d43fa 100644
--- a/include/asm-sparc/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
diff --git a/include/asm-sparc/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
index 296ef30e05c8..296ef30e05c8 100644
--- a/include/asm-sparc/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
diff --git a/include/asm-sparc/uctx.h b/arch/sparc/include/asm/uctx.h
index dc937c75ffdd..dc937c75ffdd 100644
--- a/include/asm-sparc/uctx.h
+++ b/arch/sparc/include/asm/uctx.h
diff --git a/include/asm-sparc/unaligned.h b/arch/sparc/include/asm/unaligned.h
index 11d2d5fb5902..11d2d5fb5902 100644
--- a/include/asm-sparc/unaligned.h
+++ b/arch/sparc/include/asm/unaligned.h
diff --git a/include/asm-sparc/unistd.h b/arch/sparc/include/asm/unistd.h
index 3c2609618a09..4207fb362da0 100644
--- a/include/asm-sparc/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_UNISTD_H
 #define ___ASM_SPARC_UNISTD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/unistd_64.h>
+#include <asm/unistd_64.h>
 #else
-#include <asm-sparc/unistd_32.h>
+#include <asm/unistd_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/unistd_32.h b/arch/sparc/include/asm/unistd_32.h
index 648643a9f139..648643a9f139 100644
--- a/include/asm-sparc/unistd_32.h
+++ b/arch/sparc/include/asm/unistd_32.h
diff --git a/include/asm-sparc/unistd_64.h b/arch/sparc/include/asm/unistd_64.h
index c5cc0e052321..c5cc0e052321 100644
--- a/include/asm-sparc/unistd_64.h
+++ b/arch/sparc/include/asm/unistd_64.h
diff --git a/include/asm-sparc/upa.h b/arch/sparc/include/asm/upa.h
index 5b1633223f92..5b1633223f92 100644
--- a/include/asm-sparc/upa.h
+++ b/arch/sparc/include/asm/upa.h
diff --git a/include/asm-sparc/user.h b/arch/sparc/include/asm/user.h
index 3400ea87f148..3400ea87f148 100644
--- a/include/asm-sparc/user.h
+++ b/arch/sparc/include/asm/user.h
diff --git a/include/asm-sparc/utrap.h b/arch/sparc/include/asm/utrap.h
index 9da37babbe5b..b10e527c22d9 100644
--- a/include/asm-sparc/utrap.h
+++ b/arch/sparc/include/asm/utrap.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/utrap.h
+ * include/asm/utrap.h
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
diff --git a/include/asm-sparc/vac-ops.h b/arch/sparc/include/asm/vac-ops.h
index d10527611f11..d10527611f11 100644
--- a/include/asm-sparc/vac-ops.h
+++ b/arch/sparc/include/asm/vac-ops.h
diff --git a/include/asm-sparc/vaddrs.h b/arch/sparc/include/asm/vaddrs.h
index a22fed5a3c6b..541e13755cec 100644
--- a/include/asm-sparc/vaddrs.h
+++ b/arch/sparc/include/asm/vaddrs.h
@@ -4,7 +4,7 @@
 #include <asm/head.h>
 
 /*
- * asm-sparc/vaddrs.h:  Here we define the virtual addresses at
+ * asm/vaddrs.h:  Here we define the virtual addresses at
  *                      which important things will be mapped.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc/vfc_ioctls.h b/arch/sparc/include/asm/vfc_ioctls.h
index af8b69007b22..af8b69007b22 100644
--- a/include/asm-sparc/vfc_ioctls.h
+++ b/arch/sparc/include/asm/vfc_ioctls.h
diff --git a/include/asm-sparc/vga.h b/arch/sparc/include/asm/vga.h
index c69d5b2ba19a..c69d5b2ba19a 100644
--- a/include/asm-sparc/vga.h
+++ b/arch/sparc/include/asm/vga.h
diff --git a/include/asm-sparc/viking.h b/arch/sparc/include/asm/viking.h
index 989930aeb093..989930aeb093 100644
--- a/include/asm-sparc/viking.h
+++ b/arch/sparc/include/asm/viking.h
diff --git a/include/asm-sparc/vio.h b/arch/sparc/include/asm/vio.h
index d4de32f0f8af..d4de32f0f8af 100644
--- a/include/asm-sparc/vio.h
+++ b/arch/sparc/include/asm/vio.h
diff --git a/include/asm-sparc/visasm.h b/arch/sparc/include/asm/visasm.h
index de797b9bf552..de797b9bf552 100644
--- a/include/asm-sparc/visasm.h
+++ b/arch/sparc/include/asm/visasm.h
diff --git a/include/asm-sparc/watchdog.h b/arch/sparc/include/asm/watchdog.h
index 5baf2d3919cf..5baf2d3919cf 100644
--- a/include/asm-sparc/watchdog.h
+++ b/arch/sparc/include/asm/watchdog.h
diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h
index 5b0a06dc3bcb..5b0a06dc3bcb 100644
--- a/include/asm-sparc/winmacro.h
+++ b/arch/sparc/include/asm/winmacro.h
diff --git a/include/asm-sparc/xor.h b/arch/sparc/include/asm/xor.h
index 35089a838c3f..8ed591c7db2d 100644
--- a/include/asm-sparc/xor.h
+++ b/arch/sparc/include/asm/xor.h
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_XOR_H
 #define ___ASM_SPARC_XOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/xor_64.h>
+#include <asm/xor_64.h>
 #else
-#include <asm-sparc/xor_32.h>
+#include <asm/xor_32.h>
 #endif
 #endif
diff --git a/include/asm-sparc/xor_32.h b/arch/sparc/include/asm/xor_32.h
index f34b2cfa8206..44bfa0787f3f 100644
--- a/include/asm-sparc/xor_32.h
+++ b/arch/sparc/include/asm/xor_32.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/xor.h
+ * include/asm/xor.h
  *
  * Optimized RAID-5 checksumming functions for 32-bit Sparc.
  *
diff --git a/include/asm-sparc/xor_64.h b/arch/sparc/include/asm/xor_64.h
index a0233884fc94..bee4bf4be3af 100644
--- a/include/asm-sparc/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/xor.h
+ * include/asm/xor.h
  *
  * High speed xor_block operation for RAID4/5 utilizing the
  * UltraSparc Visual Instruction Set and Niagara block-init
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 2f96256dc515..e8cdf715a546 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1196,8 +1196,9 @@ sys_rt_sigreturn:
         be      1f
          nop
 
+        add     %sp, STACKFRAME_SZ, %o0
         call    syscall_trace
-         nop
+         mov    1, %o1
 
 1:
         /* We are returning to a signal handler. */
@@ -1287,8 +1288,12 @@ linux_fast_syscall:
          mov    %i3, %o3
 
 linux_syscall_trace:
+        add     %sp, STACKFRAME_SZ, %o0
         call    syscall_trace
-         nop
+         mov    0, %o1
+        cmp     %o0, 0
+        bne     3f
+         mov    -ENOSYS, %o0
         mov     %i0, %o0
         mov     %i1, %o1
         mov     %i2, %o2
@@ -1337,6 +1342,7 @@ syscall_is_too_hard:
         call    %l7
          mov    %i5, %o5
 
+3:
         st      %o0, [%sp + STACKFRAME_SZ + PT_I0]
 
 ret_sys_call:
@@ -1374,6 +1380,8 @@ ret_sys_call:
          st     %l2, [%sp + STACKFRAME_SZ + PT_NPC]
 
 linux_syscall_trace2:
+        add     %sp, STACKFRAME_SZ, %o0
+        mov     1, %o1
         call    syscall_trace
          add    %l1, 0x4, %l2                   /* npc = npc+4 */
         st      %l1, [%sp + STACKFRAME_SZ + PT_PC]
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 81f3b929743f..20699c701412 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -21,6 +21,7 @@
 #include <linux/signal.h>
 #include <linux/regset.h>
 #include <linux/elf.h>
+#include <linux/tracehook.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -450,21 +451,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         return ret;
 }
 
-asmlinkage void syscall_trace(void)
+asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)
 {
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
-        if (!(current->ptrace & PT_PTRACED))
-                return;
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig (current->exit_code, current, 1);
-                current->exit_code = 0;
+        int ret = 0;
+
+        if (test_thread_flag(TIF_SYSCALL_TRACE)) {
+                if (syscall_exit_p)
+                        tracehook_report_syscall_exit(regs, 0);
+                else
+                        ret = tracehook_report_syscall_entry(regs);
         }
+
+        return ret;
 }
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S
index 891f460b7b96..4da2e1f66290 100644
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
@@ -69,12 +69,13 @@ ret_trap_lockless_ipi:
 
         ld      [%curptr + TI_FLAGS], %g2
 signal_p:
-        andcc   %g2, (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %g0
+        andcc   %g2, _TIF_DO_NOTIFY_RESUME_MASK, %g0
         bz,a    ret_trap_continue
          ld     [%sp + STACKFRAME_SZ + PT_PSR], %t_psr
 
+        mov     %g2, %o2
         mov     %l5, %o1
-        call    do_signal
+        call    do_notify_resume
          add    %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr
 
         /* Fall through. */
diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c
index 3fd1df9f9ba7..c94f91c8b6e0 100644
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@@ -18,6 +18,7 @@
 #include <linux/smp.h>
 #include <linux/binfmts.h>      /* do_coredum */
 #include <linux/bitops.h>
+#include <linux/tracehook.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -513,7 +514,7 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
  * want to handle. Thus you cannot kill init even with a SIGKILL even by
  * mistake.
  */
-asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0)
+static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 {
         struct k_sigaction ka;
         int restart_syscall;
@@ -552,6 +553,8 @@ asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0)
                  */
                 if (test_thread_flag(TIF_RESTORE_SIGMASK))
                         clear_thread_flag(TIF_RESTORE_SIGMASK);
+
+                tracehook_signal_handler(signr, &info, &ka, regs, 0);
                 return;
         }
         if (restart_syscall &&
@@ -579,6 +582,17 @@ asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0)
         }
 }
 
+void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
+                      unsigned long thread_info_flags)
+{
+        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+                do_signal(regs, orig_i0);
+        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
+                clear_thread_flag(TIF_NOTIFY_RESUME);
+                tracehook_notify_resume(regs);
+        }
+}
+
 asmlinkage int
 do_sys_sigstack(struct sigstack __user *ssptr, struct sigstack __user *ossptr,
                 unsigned long sp)
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 7c88263256af..923a98959fa7 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -17,6 +17,7 @@ config SPARC64
         select HAVE_LMB
         select HAVE_ARCH_KGDB
         select USE_GENERIC_SMP_HELPERS if SMP
+        select HAVE_ARCH_TRACEHOOK
 
 config GENERIC_TIME
         bool
diff --git a/arch/sparc64/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c
index c1979482aa92..c831b0a4e660 100644
--- a/arch/sparc64/kernel/compat_audit.c
+++ b/arch/sparc64/kernel/compat_audit.c
@@ -1,4 +1,4 @@
-#include <asm-sparc/unistd.h>
+#include <asm/unistd_32.h>
 
 unsigned sparc32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h
index 32fbab620852..fc294a292899 100644
--- a/arch/sparc64/kernel/entry.h
+++ b/arch/sparc64/kernel/entry.h
@@ -22,8 +22,7 @@ extern void do_notify_resume(struct pt_regs *regs,
                              unsigned long orig_i0,
                              unsigned long thread_info_flags);
 
-extern asmlinkage void syscall_trace(struct pt_regs *regs,
-                                     int syscall_exit_p);
+extern asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p);
 
 extern void bad_trap_tl1(struct pt_regs *regs, long lvl);
 
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index f6c9fc92921d..bd578cc4856d 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -23,6 +23,7 @@
 #include <linux/audit.h>
 #include <linux/signal.h>
 #include <linux/regset.h>
+#include <linux/tracehook.h>
 #include <linux/compat.h>
 #include <linux/elf.h>
 
@@ -1049,8 +1050,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         return ret;
 }
 
-asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
+asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)
 {
+        int ret = 0;
+
         /* do the secure computing check first */
         secure_computing(regs->u_regs[UREG_G1]);
 
@@ -1064,27 +1067,14 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
                 audit_syscall_exit(result, regs->u_regs[UREG_I0]);
         }
 
-        if (!(current->ptrace & PT_PTRACED))
-                goto out;
-
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                goto out;
-
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
-
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
+        if (test_thread_flag(TIF_SYSCALL_TRACE)) {
+                if (syscall_exit_p)
+                        tracehook_report_syscall_exit(regs, 0);
+                else
+                        ret = tracehook_report_syscall_entry(regs);
         }
 
-out:
-        if (unlikely(current->audit_context) && !syscall_exit_p)
+        if (unlikely(current->audit_context) && !syscall_exit_p && !ret)
                 audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
                                      AUDIT_ARCH_SPARC :
                                      AUDIT_ARCH_SPARC64),
@@ -1093,4 +1083,6 @@ out:
                                     regs->u_regs[UREG_I1],
                                     regs->u_regs[UREG_I2],
                                     regs->u_regs[UREG_I3]);
+
+        return ret;
 }
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index c6fc695fe1fe..97a993c1f7f3 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -46,7 +46,7 @@ __handle_user_windows:
                 wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
                 ldx                     [%g6 + TI_FLAGS], %l0
 
-1:              andcc                   %l0, _TIF_SIGPENDING, %g0
+1:              andcc                   %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0
                 be,pt                   %xcc, __handle_user_windows_continue
                  nop
                 mov                     %l5, %o1
@@ -86,7 +86,7 @@ __handle_perfctrs:
                  wrpr                   %g0, RTRAP_PSTATE, %pstate
                 wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
                 ldx                     [%g6 + TI_FLAGS], %l0
-1:              andcc                   %l0, _TIF_SIGPENDING, %g0
+1:              andcc                   %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0
 
                 be,pt                   %xcc, __handle_perfctrs_continue
                  sethi                  %hi(TSTATE_PEF), %o0
@@ -195,7 +195,7 @@ __handle_preemption_continue:
                  andcc                  %l1, %o0, %g0
                 andcc                   %l0, _TIF_NEED_RESCHED, %g0
                 bne,pn                  %xcc, __handle_preemption
-                 andcc                  %l0, _TIF_SIGPENDING, %g0
+                 andcc                  %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0
                 bne,pn                  %xcc, __handle_signal
 __handle_signal_continue:
                  ldub                   [%g6 + TI_WSAVED], %o2
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index 9667e96fd513..d1b84456a9ee 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -17,11 +17,13 @@
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/unistd.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
 #include <linux/bitops.h>
+#include <linux/tracehook.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -574,6 +576,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
                  * clear the TS_RESTORE_SIGMASK flag.
                  */
                 current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
+
+                tracehook_signal_handler(signr, &info, &ka, regs, 0);
                 return;
         }
         if (restart_syscall &&
@@ -605,4 +609,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long
 {
         if (thread_info_flags & _TIF_SIGPENDING)
                 do_signal(regs, orig_i0);
+        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
+                clear_thread_flag(TIF_NOTIFY_RESUME);
+                tracehook_notify_resume(regs);
+        }
 }
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 97cdd1bf4a10..ba5b09ad6666 100644
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -19,6 +19,7 @@
 #include <linux/binfmts.h>
 #include <linux/compat.h>
 #include <linux/bitops.h>
+#include <linux/tracehook.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -794,6 +795,8 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs,
                  * clear the TS_RESTORE_SIGMASK flag.
                  */
                 current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
+
+                tracehook_signal_handler(signr, &info, &ka, regs, 0);
                 return;
         }
         if (restart_syscall &&
diff --git a/arch/sparc64/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S
index db19ed67acf6..a2f24270ed8a 100644
--- a/arch/sparc64/kernel/syscalls.S
+++ b/arch/sparc64/kernel/syscalls.S
@@ -162,6 +162,8 @@ linux_syscall_trace32:
         add     %sp, PTREGS_OFF, %o0
         call    syscall_trace
          clr    %o1
+        brnz,pn %o0, 3f
+         mov    -ENOSYS, %o0
         srl     %i0, 0, %o0
         srl     %i4, 0, %o4
         srl     %i1, 0, %o1
@@ -173,6 +175,8 @@ linux_syscall_trace:
         add     %sp, PTREGS_OFF, %o0
         call    syscall_trace
          clr    %o1
+        brnz,pn %o0, 3f
+         mov    -ENOSYS, %o0
         mov     %i0, %o0
         mov     %i1, %o1
         mov     %i2, %o2
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b6fa2877b173..3d0f2b6a5a16 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -30,6 +30,7 @@ config X86
         select HAVE_FTRACE
         select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
         select HAVE_ARCH_KGDB if !X86_VOYAGER
+        select HAVE_GENERIC_DMA_COHERENT if X86_32
         select HAVE_EFFICIENT_UNALIGNED_ACCESS
 
 config ARCH_DEFCONFIG
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index 9220cf46aa10..c2502eb9aa83 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -73,7 +73,6 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,
         struct cpuinfo_x86 *c = &cpu_data(cpu);
 
         cpumask_t saved_mask;
-        cpumask_of_cpu_ptr(new_mask, cpu);
         int retval;
         unsigned int eax, ebx, ecx, edx;
         unsigned int edx_part;
@@ -92,7 +91,7 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,
 
         /* Make sure we are running on right CPU */
         saved_mask = current->cpus_allowed;
-        retval = set_cpus_allowed_ptr(current, new_mask);
+        retval = set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         if (retval)
                 return -1;
 
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 74697408576f..22d7d050905d 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -29,9 +29,6 @@
 
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 
-#define to_pages(addr, size) \
-         (round_up(((addr) & ~PAGE_MASK) + (size), PAGE_SIZE) >> PAGE_SHIFT)
-
 #define EXIT_LOOP_COUNT 10000000
 
 static DEFINE_RWLOCK(amd_iommu_devtable_lock);
@@ -185,7 +182,7 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid,
                 u64 address, size_t size)
 {
         int s = 0;
-        unsigned pages = to_pages(address, size);
+        unsigned pages = iommu_num_pages(address, size);
 
         address &= PAGE_MASK;
 
@@ -557,8 +554,8 @@ static struct dma_ops_domain *dma_ops_domain_alloc(struct amd_iommu *iommu,
         if (iommu->exclusion_start &&
             iommu->exclusion_start < dma_dom->aperture_size) {
                 unsigned long startpage = iommu->exclusion_start >> PAGE_SHIFT;
-                int pages = to_pages(iommu->exclusion_start,
-                                iommu->exclusion_length);
+                int pages = iommu_num_pages(iommu->exclusion_start,
+                                            iommu->exclusion_length);
                 dma_ops_reserve_addresses(dma_dom, startpage, pages);
         }
 
@@ -767,7 +764,7 @@ static dma_addr_t __map_single(struct device *dev,
         unsigned int pages;
         int i;
 
-        pages = to_pages(paddr, size);
+        pages = iommu_num_pages(paddr, size);
         paddr &= PAGE_MASK;
 
         address = dma_ops_alloc_addresses(dev, dma_dom, pages);
@@ -802,7 +799,7 @@ static void __unmap_single(struct amd_iommu *iommu,
         if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size))
                 return;
 
-        pages = to_pages(dma_addr, size);
+        pages = iommu_num_pages(dma_addr, size);
         dma_addr &= PAGE_MASK;
         start = dma_addr;
 
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index ff2fff56f0a8..dd097b835839 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -200,12 +200,10 @@ static void drv_read(struct drv_cmd *cmd)
 static void drv_write(struct drv_cmd *cmd)
 {
         cpumask_t saved_mask = current->cpus_allowed;
-        cpumask_of_cpu_ptr_declare(cpu_mask);
         unsigned int i;
 
         for_each_cpu_mask_nr(i, cmd->mask) {
-                cpumask_of_cpu_ptr_next(cpu_mask, i);
-                set_cpus_allowed_ptr(current, cpu_mask);
+                set_cpus_allowed_ptr(current, &cpumask_of_cpu(i));
                 do_drv_write(cmd);
         }
 
@@ -269,12 +267,11 @@ static unsigned int get_measured_perf(unsigned int cpu)
         } aperf_cur, mperf_cur;
 
         cpumask_t saved_mask;
-        cpumask_of_cpu_ptr(cpu_mask, cpu);
         unsigned int perf_percent;
         unsigned int retval;
 
         saved_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpu_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         if (get_cpu() != cpu) {
                 /* We were not able to run on requested processor */
                 put_cpu();
@@ -340,7 +337,6 @@ static unsigned int get_measured_perf(unsigned int cpu)
 
 static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
 {
-        cpumask_of_cpu_ptr(cpu_mask, cpu);
         struct acpi_cpufreq_data *data = per_cpu(drv_data, cpu);
         unsigned int freq;
         unsigned int cached_freq;
@@ -353,7 +349,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
         }
 
         cached_freq = data->freq_table[data->acpi_data->state].frequency;
-        freq = extract_freq(get_cur_val(cpu_mask), data);
+        freq = extract_freq(get_cur_val(&cpumask_of_cpu(cpu)), data);
         if (freq != cached_freq) {
                 /*
                  * The dreaded BIOS frequency change behind our back.
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 53c7b6936973..c45ca6d4dce1 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -479,12 +479,11 @@ static int core_voltage_post_transition(struct powernow_k8_data *data, u32 reqvi
 static int check_supported_cpu(unsigned int cpu)
 {
         cpumask_t oldmask;
-        cpumask_of_cpu_ptr(cpu_mask, cpu);
         u32 eax, ebx, ecx, edx;
         unsigned int rc = 0;
 
         oldmask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpu_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
 
         if (smp_processor_id() != cpu) {
                 printk(KERN_ERR PFX "limiting to cpu %u failed\n", cpu);
@@ -1017,7 +1016,6 @@ static int transition_frequency_pstate(struct powernow_k8_data *data, unsigned i
 static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation)
 {
         cpumask_t oldmask;
-        cpumask_of_cpu_ptr(cpu_mask, pol->cpu);
         struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu);
         u32 checkfid;
         u32 checkvid;
@@ -1032,7 +1030,7 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi
 
         /* only run on specific CPU from here on */
         oldmask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpu_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(pol->cpu));
 
         if (smp_processor_id() != pol->cpu) {
                 printk(KERN_ERR PFX "limiting to cpu %u failed\n", pol->cpu);
@@ -1107,7 +1105,6 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data;
         cpumask_t oldmask;
-        cpumask_of_cpu_ptr_declare(newmask);
         int rc;
 
         if (!cpu_online(pol->cpu))
@@ -1159,8 +1156,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 
         /* only run on specific CPU from here on */
         oldmask = current->cpus_allowed;
-        cpumask_of_cpu_ptr_next(newmask, pol->cpu);
-        set_cpus_allowed_ptr(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(pol->cpu));
 
         if (smp_processor_id() != pol->cpu) {
                 printk(KERN_ERR PFX "limiting to cpu %u failed\n", pol->cpu);
@@ -1182,7 +1178,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
         set_cpus_allowed_ptr(current, &oldmask);
 
         if (cpu_family == CPU_HW_PSTATE)
-                pol->cpus = *newmask;
+                pol->cpus = cpumask_of_cpu(pol->cpu);
         else
                 pol->cpus = per_cpu(cpu_core_map, pol->cpu);
         data->available_cores = &(pol->cpus);
@@ -1248,7 +1244,6 @@ static unsigned int powernowk8_get (unsigned int cpu)
 {
         struct powernow_k8_data *data;
         cpumask_t oldmask = current->cpus_allowed;
-        cpumask_of_cpu_ptr(newmask, cpu);
         unsigned int khz = 0;
         unsigned int first;
 
@@ -1258,7 +1253,7 @@ static unsigned int powernowk8_get (unsigned int cpu)
         if (!data)
                 return -EINVAL;
 
-        set_cpus_allowed_ptr(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         if (smp_processor_id() != cpu) {
                 printk(KERN_ERR PFX
                         "limiting to CPU %d failed in powernowk8_get\n", cpu);
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
index ca2ac13b7af2..15e13c01cc36 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -324,10 +324,9 @@ static unsigned int get_cur_freq(unsigned int cpu)
         unsigned l, h;
         unsigned clock_freq;
         cpumask_t saved_mask;
-        cpumask_of_cpu_ptr(new_mask, cpu);
 
         saved_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, new_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         if (smp_processor_id() != cpu)
                 return 0;
 
@@ -585,15 +584,12 @@ static int centrino_target (struct cpufreq_policy *policy,
                  * Best effort undo..
                  */
 
-                if (!cpus_empty(*covered_cpus)) {
-                        cpumask_of_cpu_ptr_declare(new_mask);
-
+                if (!cpus_empty(*covered_cpus))
                         for_each_cpu_mask_nr(j, *covered_cpus) {
-                                cpumask_of_cpu_ptr_next(new_mask, j);
-                                set_cpus_allowed_ptr(current, new_mask);
+                                set_cpus_allowed_ptr(current,
+                                                     &cpumask_of_cpu(j));
                                 wrmsr(MSR_IA32_PERF_CTL, oldmsr, h);
                         }
-                }
 
                 tmp = freqs.new;
                 freqs.new = freqs.old;
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
index 2f3728dc24f6..191f7263c61d 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
@@ -244,8 +244,7 @@ static unsigned int _speedstep_get(const cpumask_t *cpus)
 
 static unsigned int speedstep_get(unsigned int cpu)
 {
-        cpumask_of_cpu_ptr(newmask, cpu);
-        return _speedstep_get(newmask);
+        return _speedstep_get(&cpumask_of_cpu(cpu));
 }
 
 /**
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 650d40f7912b..6b0a10b002f1 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -516,7 +516,6 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
         unsigned long           j;
         int                     retval;
         cpumask_t               oldmask;
-        cpumask_of_cpu_ptr(newmask, cpu);
 
         if (num_cache_leaves == 0)
                 return -ENOENT;
@@ -527,7 +526,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
                 return -ENOMEM;
 
         oldmask = current->cpus_allowed;
-        retval = set_cpus_allowed_ptr(current, newmask);
+        retval = set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         if (retval)
                 goto out;
 
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
index 3fee2aa50f3f..b68e21f06f4f 100644
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
@@ -62,12 +62,10 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
 
         if (reload) {
 #ifdef CONFIG_SMP
-                cpumask_of_cpu_ptr_declare(mask);
-
                 preempt_disable();
                 load_LDT(pc);
-                cpumask_of_cpu_ptr_next(mask, smp_processor_id());
-                if (!cpus_equal(current->mm->cpu_vm_mask, *mask))
+                if (!cpus_equal(current->mm->cpu_vm_mask,
+                                cpumask_of_cpu(smp_processor_id())))
                         smp_call_function(flush_ldt, current->mm, 1);
                 preempt_enable();
 #else
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 6994c751590e..652fa5c38ebe 100644
--- a/arch/x86/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
@@ -388,7 +388,6 @@ static int do_microcode_update (void)
         void *new_mc = NULL;
         int cpu;
         cpumask_t old;
-        cpumask_of_cpu_ptr_declare(newmask);
 
         old = current->cpus_allowed;
 
@@ -405,8 +404,7 @@ static int do_microcode_update (void)
 
                         if (!uci->valid)
                                 continue;
-                        cpumask_of_cpu_ptr_next(newmask, cpu);
-                        set_cpus_allowed_ptr(current, newmask);
+                        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
                         error = get_maching_microcode(new_mc, cpu);
                         if (error < 0)
                                 goto out;
@@ -576,7 +574,6 @@ static int apply_microcode_check_cpu(int cpu)
         struct cpuinfo_x86 *c = &cpu_data(cpu);
         struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
         cpumask_t old;
-        cpumask_of_cpu_ptr(newmask, cpu);
         unsigned int val[2];
         int err = 0;
 
@@ -585,7 +582,7 @@ static int apply_microcode_check_cpu(int cpu)
                 return 0;
 
         old = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
 
         /* Check if the microcode we have in memory matches the CPU */
         if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 ||
@@ -623,12 +620,11 @@ static int apply_microcode_check_cpu(int cpu)
 static void microcode_init_cpu(int cpu, int resume)
 {
         cpumask_t old;
-        cpumask_of_cpu_ptr(newmask, cpu);
         struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
         old = current->cpus_allowed;
 
-        set_cpus_allowed_ptr(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
         mutex_lock(&microcode_mutex);
         collect_cpu_info(cpu);
         if (uci->valid && system_state == SYSTEM_RUNNING && !resume)
@@ -661,13 +657,10 @@ static ssize_t reload_store(struct sys_device *dev,
         if (end == buf)
                 return -EINVAL;
         if (val == 1) {
-                cpumask_t old;
-                cpumask_of_cpu_ptr(newmask, cpu);
-
-                old = current->cpus_allowed;
+                cpumask_t old = current->cpus_allowed;
 
                 get_online_cpus();
-                set_cpus_allowed_ptr(current, newmask);
+                set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
 
                 mutex_lock(&microcode_mutex);
                 if (uci->valid)
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 37544123896d..8dbffb846de9 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -192,124 +192,6 @@ static __init int iommu_setup(char *p)
 }
 early_param("iommu", iommu_setup);
 
-#ifdef CONFIG_X86_32
-int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-                                dma_addr_t device_addr, size_t size, int flags)
-{
-        void __iomem *mem_base = NULL;
-        int pages = size >> PAGE_SHIFT;
-        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
-
-        if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
-                goto out;
-        if (!size)
-                goto out;
-        if (dev->dma_mem)
-                goto out;
-
-        /* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
-
-        mem_base = ioremap(bus_addr, size);
-        if (!mem_base)
-                goto out;
-
-        dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
-        if (!dev->dma_mem)
-                goto out;
-        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
-        if (!dev->dma_mem->bitmap)
-                goto free1_out;
-
-        dev->dma_mem->virt_base = mem_base;
-        dev->dma_mem->device_base = device_addr;
-        dev->dma_mem->size = pages;
-        dev->dma_mem->flags = flags;
-
-        if (flags & DMA_MEMORY_MAP)
-                return DMA_MEMORY_MAP;
-
-        return DMA_MEMORY_IO;
-
- free1_out:
-        kfree(dev->dma_mem);
- out:
-        if (mem_base)
-                iounmap(mem_base);
-        return 0;
-}
-EXPORT_SYMBOL(dma_declare_coherent_memory);
-
-void dma_release_declared_memory(struct device *dev)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-
-        if (!mem)
-                return;
-        dev->dma_mem = NULL;
-        iounmap(mem->virt_base);
-        kfree(mem->bitmap);
-        kfree(mem);
-}
-EXPORT_SYMBOL(dma_release_declared_memory);
-
-void *dma_mark_declared_memory_occupied(struct device *dev,
-                                        dma_addr_t device_addr, size_t size)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-        int pos, err;
-        int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1);
-
-        pages >>= PAGE_SHIFT;
-
-        if (!mem)
-                return ERR_PTR(-EINVAL);
-
-        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
-        err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
-        if (err != 0)
-                return ERR_PTR(err);
-        return mem->virt_base + (pos << PAGE_SHIFT);
-}
-EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
-
-static int dma_alloc_from_coherent_mem(struct device *dev, ssize_t size,
-                                       dma_addr_t *dma_handle, void **ret)
-{
-        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
-        int order = get_order(size);
-
-        if (mem) {
-                int page = bitmap_find_free_region(mem->bitmap, mem->size,
-                                                     order);
-                if (page >= 0) {
-                        *dma_handle = mem->device_base + (page << PAGE_SHIFT);
-                        *ret = mem->virt_base + (page << PAGE_SHIFT);
-                        memset(*ret, 0, size);
-                }
-                if (mem->flags & DMA_MEMORY_EXCLUSIVE)
-                        *ret = NULL;
-        }
-        return (mem != NULL);
-}
-
-static int dma_release_coherent(struct device *dev, int order, void *vaddr)
-{
-        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
-
-        if (mem && vaddr >= mem->virt_base && vaddr <
-                   (mem->virt_base + (mem->size << PAGE_SHIFT))) {
-                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-
-                bitmap_release_region(mem->bitmap, page, order);
-                return 1;
-        }
-        return 0;
-}
-#else
-#define dma_alloc_from_coherent_mem(dev, size, handle, ret) (0)
-#define dma_release_coherent(dev, order, vaddr) (0)
-#endif /* CONFIG_X86_32 */
-
 int dma_supported(struct device *dev, u64 mask)
 {
         struct dma_mapping_ops *ops = get_dma_ops(dev);
@@ -379,7 +261,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
         /* ignore region specifiers */
         gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
 
-        if (dma_alloc_from_coherent_mem(dev, size, dma_handle, &memory))
+        if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
                 return memory;
 
         if (!dev) {
@@ -484,7 +366,7 @@ void dma_free_coherent(struct device *dev, size_t size,
 
         int order = get_order(size);
         WARN_ON(irqs_disabled());       /* for portability */
-        if (dma_release_coherent(dev, order, vaddr))
+        if (dma_release_from_coherent(dev, order, vaddr))
                 return;
         if (ops->unmap_single)
                 ops->unmap_single(dev, bus, size, 0);
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 744126e64950..49285f8fd4d5 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -67,9 +67,6 @@ static u32 gart_unmapped_entry;
         (((x) & 0xfffff000) | (((x) >> 32) << 4) | GPTE_VALID | GPTE_COHERENT)
 #define GPTE_DECODE(x) (((x) & 0xfffff000) | (((u64)(x) & 0xff0) << 28))
 
-#define to_pages(addr, size) \
-        (round_up(((addr) & ~PAGE_MASK) + (size), PAGE_SIZE) >> PAGE_SHIFT)
-
 #define EMERGENCY_PAGES 32 /* = 128KB */
 
 #ifdef CONFIG_AGP
@@ -241,7 +238,7 @@ nonforced_iommu(struct device *dev, unsigned long addr, size_t size)
 static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem,
                                 size_t size, int dir)
 {
-        unsigned long npages = to_pages(phys_mem, size);
+        unsigned long npages = iommu_num_pages(phys_mem, size);
         unsigned long iommu_page = alloc_iommu(dev, npages);
         int i;
 
@@ -304,7 +301,7 @@ static void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,
                 return;
 
         iommu_page = (dma_addr - iommu_bus_base)>>PAGE_SHIFT;
-        npages = to_pages(dma_addr, size);
+        npages = iommu_num_pages(dma_addr, size);
         for (i = 0; i < npages; i++) {
                 iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;
                 CLEAR_LEAK(iommu_page + i);
@@ -387,7 +384,7 @@ static int __dma_map_cont(struct device *dev, struct scatterlist *start,
                 }
 
                 addr = phys_addr;
-                pages = to_pages(s->offset, s->length);
+                pages = iommu_num_pages(s->offset, s->length);
                 while (pages--) {
                         iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr);
                         SET_LEAK(iommu_page);
@@ -470,7 +467,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)
 
                 seg_size += s->length;
                 need = nextneed;
-                pages += to_pages(s->offset, s->length);
+                pages += iommu_num_pages(s->offset, s->length);
                 ps = s;
         }
         if (dma_map_cont(dev, start_sg, i - start, sgmap, pages, need) < 0)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 06a9f643817e..724adfc63cb9 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -414,25 +414,20 @@ void native_machine_shutdown(void)
 
         /* The boot cpu is always logical cpu 0 */
         int reboot_cpu_id = 0;
-        cpumask_of_cpu_ptr(newmask, reboot_cpu_id);
 
 #ifdef CONFIG_X86_32
         /* See if there has been given a command line override */
         if ((reboot_cpu != -1) && (reboot_cpu < NR_CPUS) &&
-                cpu_online(reboot_cpu)) {
+                cpu_online(reboot_cpu))
                 reboot_cpu_id = reboot_cpu;
-                cpumask_of_cpu_ptr_next(newmask, reboot_cpu_id);
-        }
 #endif
 
         /* Make certain the cpu I'm about to reboot on is online */
-        if (!cpu_online(reboot_cpu_id)) {
+        if (!cpu_online(reboot_cpu_id))
                 reboot_cpu_id = smp_processor_id();
-                cpumask_of_cpu_ptr_next(newmask, reboot_cpu_id);
-        }
 
         /* Make certain I only run on the appropriate processor */
-        set_cpus_allowed_ptr(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(reboot_cpu_id));
 
         /* O.K Now that I'm on the appropriate processor,
          * stop all of the others.
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index f7745f94c006..76e305e064f9 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -80,24 +80,6 @@ static void __init setup_per_cpu_maps(void)
 #endif
 }
 
-#ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP
-cpumask_t *cpumask_of_cpu_map __read_mostly;
-EXPORT_SYMBOL(cpumask_of_cpu_map);
-
-/* requires nr_cpu_ids to be initialized */
-static void __init setup_cpumask_of_cpu(void)
-{
-        int i;
-
-        /* alloc_bootmem zeroes memory */
-        cpumask_of_cpu_map = alloc_bootmem_low(sizeof(cpumask_t) * nr_cpu_ids);
-        for (i = 0; i < nr_cpu_ids; i++)
-                cpu_set(i, cpumask_of_cpu_map[i]);
-}
-#else
-static inline void setup_cpumask_of_cpu(void) { }
-#endif
-
 #ifdef CONFIG_X86_32
 /*
  * Great future not-so-futuristic plan: make i386 and x86_64 do it
@@ -197,9 +179,6 @@ void __init setup_per_cpu_areas(void)
 
         /* Setup node to cpumask map */
         setup_node_to_cpumask_map();
-
-        /* Setup cpumask_of_cpu map */
-        setup_cpumask_of_cpu();
 }
 
 #endif
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 8d45fabc5f3b..ce3251ce5504 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -21,6 +21,7 @@ config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
         depends on HAVE_KVM
         select PREEMPT_NOTIFIERS
+        select MMU_NOTIFIER
         select ANON_INODES
         ---help---
           Support hosting fully virtualized guest machines using hardware
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index b0e4ddca6c18..2fa231923cf7 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1814,6 +1814,7 @@ int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva)
         spin_unlock(&vcpu->kvm->mmu_lock);
         return r;
 }
+EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page_virt);
 
 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
 {
@@ -1870,6 +1871,12 @@ void kvm_enable_tdp(void)
 }
 EXPORT_SYMBOL_GPL(kvm_enable_tdp);
 
+void kvm_disable_tdp(void)
+{
+        tdp_enabled = false;
+}
+EXPORT_SYMBOL_GPL(kvm_disable_tdp);
+
 static void free_mmu_pages(struct kvm_vcpu *vcpu)
 {
         struct kvm_mmu_page *sp;
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index b756e876dce3..e2ee264740c7 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -453,7 +453,8 @@ static __init int svm_hardware_setup(void)
         if (npt_enabled) {
                 printk(KERN_INFO "kvm: Nested Paging enabled\n");
                 kvm_enable_tdp();
-        }
+        } else
+                kvm_disable_tdp();
 
         return 0;
 
@@ -1007,10 +1008,13 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
         struct kvm *kvm = svm->vcpu.kvm;
         u64 fault_address;
         u32 error_code;
+        bool event_injection = false;
 
         if (!irqchip_in_kernel(kvm) &&
-                is_external_interrupt(exit_int_info))
+            is_external_interrupt(exit_int_info)) {
+                event_injection = true;
                 push_irq(&svm->vcpu, exit_int_info & SVM_EVTINJ_VEC_MASK);
+        }
 
         fault_address  = svm->vmcb->control.exit_info_2;
         error_code = svm->vmcb->control.exit_info_1;
@@ -1024,6 +1028,8 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
                             (u32)fault_address, (u32)(fault_address >> 32),
                             handler);
 
+        if (event_injection)
+                kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address);
         return kvm_mmu_page_fault(&svm->vcpu, fault_address, error_code);
 }
 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0cac63701719..2a69773e3b26 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2298,6 +2298,8 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 cr2 = vmcs_readl(EXIT_QUALIFICATION);
                 KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2,
                             (u32)((u64)cr2 >> 32), handler);
+                if (vect_info & VECTORING_INFO_VALID_MASK)
+                        kvm_mmu_unprotect_page_virt(vcpu, cr2);
                 return kvm_mmu_page_fault(vcpu, cr2, error_code);
         }
 
@@ -3116,15 +3118,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
                 return ERR_PTR(-ENOMEM);
 
         allocate_vpid(vmx);
-        if (id == 0 && vm_need_ept()) {
-                kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
-                        VMX_EPT_WRITABLE_MASK |
-                        VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT);
-                kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,
-                                VMX_EPT_FAKE_DIRTY_MASK, 0ull,
-                                VMX_EPT_EXECUTABLE_MASK);
-                kvm_enable_tdp();
-        }
 
         err = kvm_vcpu_init(&vmx->vcpu, kvm, id);
         if (err)
@@ -3303,8 +3296,17 @@ static int __init vmx_init(void)
         vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_ESP);
         vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_EIP);
 
-        if (cpu_has_vmx_ept())
+        if (vm_need_ept()) {
                 bypass_guest_pf = 0;
+                kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
+                        VMX_EPT_WRITABLE_MASK |
+                        VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT);
+                kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,
+                                VMX_EPT_FAKE_DIRTY_MASK, 0ull,
+                                VMX_EPT_EXECUTABLE_MASK);
+                kvm_enable_tdp();
+        } else
+                kvm_disable_tdp();
 
         if (bypass_guest_pf)
                 kvm_mmu_set_nonpresent_ptes(~0xffeull, 0ull);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9f1cdb011cff..5916191420c7 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3184,6 +3184,10 @@ static void seg_desct_to_kvm_desct(struct desc_struct *seg_desc, u16 selector,
         kvm_desct->base |= seg_desc->base2 << 24;
         kvm_desct->limit = seg_desc->limit0;
         kvm_desct->limit |= seg_desc->limit << 16;
+        if (seg_desc->g) {
+                kvm_desct->limit <<= 12;
+                kvm_desct->limit |= 0xfff;
+        }
         kvm_desct->selector = selector;
         kvm_desct->type = seg_desc->type;
         kvm_desct->present = seg_desc->p;
@@ -3223,6 +3227,7 @@ static void get_segment_descritptor_dtable(struct kvm_vcpu *vcpu,
 static int load_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
                                          struct desc_struct *seg_desc)
 {
+        gpa_t gpa;
         struct descriptor_table dtable;
         u16 index = selector >> 3;
 
@@ -3232,13 +3237,16 @@ static int load_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
                 kvm_queue_exception_e(vcpu, GP_VECTOR, selector & 0xfffc);
                 return 1;
         }
-        return kvm_read_guest(vcpu->kvm, dtable.base + index * 8, seg_desc, 8);
+        gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, dtable.base);
+        gpa += index * 8;
+        return kvm_read_guest(vcpu->kvm, gpa, seg_desc, 8);
 }
 
 /* allowed just for 8 bytes segments */
 static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
                                          struct desc_struct *seg_desc)
 {
+        gpa_t gpa;
         struct descriptor_table dtable;
         u16 index = selector >> 3;
 
@@ -3246,7 +3254,9 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
 
         if (dtable.limit < index * 8 + 7)
                 return 1;
-        return kvm_write_guest(vcpu->kvm, dtable.base + index * 8, seg_desc, 8);
+        gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, dtable.base);
+        gpa += index * 8;
+        return kvm_write_guest(vcpu->kvm, gpa, seg_desc, 8);
 }
 
 static u32 get_tss_base_addr(struct kvm_vcpu *vcpu,
@@ -3258,55 +3268,7 @@ static u32 get_tss_base_addr(struct kvm_vcpu *vcpu,
         base_addr |= (seg_desc->base1 << 16);
         base_addr |= (seg_desc->base2 << 24);
 
-        return base_addr;
-}
-
-static int load_tss_segment32(struct kvm_vcpu *vcpu,
-                              struct desc_struct *seg_desc,
-                              struct tss_segment_32 *tss)
-{
-        u32 base_addr;
-
-        base_addr = get_tss_base_addr(vcpu, seg_desc);
-
-        return kvm_read_guest(vcpu->kvm, base_addr, tss,
-                              sizeof(struct tss_segment_32));
-}
-
-static int save_tss_segment32(struct kvm_vcpu *vcpu,
-                              struct desc_struct *seg_desc,
-                              struct tss_segment_32 *tss)
-{
-        u32 base_addr;
-
-        base_addr = get_tss_base_addr(vcpu, seg_desc);
-
-        return kvm_write_guest(vcpu->kvm, base_addr, tss,
-                               sizeof(struct tss_segment_32));
-}
-
-static int load_tss_segment16(struct kvm_vcpu *vcpu,
-                              struct desc_struct *seg_desc,
-                              struct tss_segment_16 *tss)
-{
-        u32 base_addr;
-
-        base_addr = get_tss_base_addr(vcpu, seg_desc);
-
-        return kvm_read_guest(vcpu->kvm, base_addr, tss,
-                              sizeof(struct tss_segment_16));
-}
-
-static int save_tss_segment16(struct kvm_vcpu *vcpu,
-                              struct desc_struct *seg_desc,
-                              struct tss_segment_16 *tss)
-{
-        u32 base_addr;
-
-        base_addr = get_tss_base_addr(vcpu, seg_desc);
-
-        return kvm_write_guest(vcpu->kvm, base_addr, tss,
-                               sizeof(struct tss_segment_16));
+        return vcpu->arch.mmu.gva_to_gpa(vcpu, base_addr);
 }
 
 static u16 get_segment_selector(struct kvm_vcpu *vcpu, int seg)
@@ -3466,20 +3428,26 @@ static int load_state_from_tss16(struct kvm_vcpu *vcpu,
 }
 
 static int kvm_task_switch_16(struct kvm_vcpu *vcpu, u16 tss_selector,
-                       struct desc_struct *cseg_desc,
+                       u32 old_tss_base,
                        struct desc_struct *nseg_desc)
 {
         struct tss_segment_16 tss_segment_16;
         int ret = 0;
 
-        if (load_tss_segment16(vcpu, cseg_desc, &tss_segment_16))
+        if (kvm_read_guest(vcpu->kvm, old_tss_base, &tss_segment_16,
+                           sizeof tss_segment_16))
                 goto out;
 
         save_state_to_tss16(vcpu, &tss_segment_16);
-        save_tss_segment16(vcpu, cseg_desc, &tss_segment_16);
 
-        if (load_tss_segment16(vcpu, nseg_desc, &tss_segment_16))
+        if (kvm_write_guest(vcpu->kvm, old_tss_base, &tss_segment_16,
+                            sizeof tss_segment_16))
                 goto out;
+
+        if (kvm_read_guest(vcpu->kvm, get_tss_base_addr(vcpu, nseg_desc),
+                           &tss_segment_16, sizeof tss_segment_16))
+                goto out;
+
         if (load_state_from_tss16(vcpu, &tss_segment_16))
                 goto out;
 
@@ -3489,20 +3457,26 @@ out:
 }
 
 static int kvm_task_switch_32(struct kvm_vcpu *vcpu, u16 tss_selector,
-                       struct desc_struct *cseg_desc,
+                       u32 old_tss_base,
                        struct desc_struct *nseg_desc)
 {
         struct tss_segment_32 tss_segment_32;
         int ret = 0;
 
-        if (load_tss_segment32(vcpu, cseg_desc, &tss_segment_32))
+        if (kvm_read_guest(vcpu->kvm, old_tss_base, &tss_segment_32,
+                           sizeof tss_segment_32))
                 goto out;
 
         save_state_to_tss32(vcpu, &tss_segment_32);
-        save_tss_segment32(vcpu, cseg_desc, &tss_segment_32);
 
-        if (load_tss_segment32(vcpu, nseg_desc, &tss_segment_32))
+        if (kvm_write_guest(vcpu->kvm, old_tss_base, &tss_segment_32,
+                            sizeof tss_segment_32))
+                goto out;
+
+        if (kvm_read_guest(vcpu->kvm, get_tss_base_addr(vcpu, nseg_desc),
+                           &tss_segment_32, sizeof tss_segment_32))
                 goto out;
+
         if (load_state_from_tss32(vcpu, &tss_segment_32))
                 goto out;
 
@@ -3517,16 +3491,20 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
         struct desc_struct cseg_desc;
         struct desc_struct nseg_desc;
         int ret = 0;
+        u32 old_tss_base = get_segment_base(vcpu, VCPU_SREG_TR);
+        u16 old_tss_sel = get_segment_selector(vcpu, VCPU_SREG_TR);
 
-        kvm_get_segment(vcpu, &tr_seg, VCPU_SREG_TR);
+        old_tss_base = vcpu->arch.mmu.gva_to_gpa(vcpu, old_tss_base);
 
+        /* FIXME: Handle errors. Failure to read either TSS or their
+         * descriptors should generate a pagefault.
+         */
         if (load_guest_segment_descriptor(vcpu, tss_selector, &nseg_desc))
                 goto out;
 
-        if (load_guest_segment_descriptor(vcpu, tr_seg.selector, &cseg_desc))
+        if (load_guest_segment_descriptor(vcpu, old_tss_sel, &cseg_desc))
                 goto out;
 
-
         if (reason != TASK_SWITCH_IRET) {
                 int cpl;
 
@@ -3544,8 +3522,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
 
         if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) {
                 cseg_desc.type &= ~(1 << 1); //clear the B flag
-                save_guest_segment_descriptor(vcpu, tr_seg.selector,
-                                              &cseg_desc);
+                save_guest_segment_descriptor(vcpu, old_tss_sel, &cseg_desc);
         }
 
         if (reason == TASK_SWITCH_IRET) {
@@ -3557,10 +3534,10 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
         kvm_x86_ops->cache_regs(vcpu);
 
         if (nseg_desc.type & 8)
-                ret = kvm_task_switch_32(vcpu, tss_selector, &cseg_desc,
+                ret = kvm_task_switch_32(vcpu, tss_selector, old_tss_base,
                                          &nseg_desc);
         else
-                ret = kvm_task_switch_16(vcpu, tss_selector, &cseg_desc,
+                ret = kvm_task_switch_16(vcpu, tss_selector, old_tss_base,
                                          &nseg_desc);
 
         if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE) {
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 0313a5eec412..d9249a882aa5 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1014,6 +1014,9 @@ __init void lguest_init(void)
         init_pg_tables_start = __pa(pg0);
         init_pg_tables_end = __pa(pg0);
 
+        /* As described in head_32.S, we map the first 128M of memory. */
+        max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT;
+
         /* Load the %fs segment register (the per-cpu segment register) with
          * the normal data segment to get through booting. */
         asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_DS) : "memory");
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
index 3085f25b4355..007bb06c7504 100644
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
@@ -223,14 +223,17 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                         struct page **pages)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long end = start + (nr_pages << PAGE_SHIFT);
-        unsigned long addr = start;
+        unsigned long addr, len, end;
         unsigned long next;
         pgd_t *pgdp;
         int nr = 0;
 
+        start &= PAGE_MASK;
+        addr = start;
+        len = (unsigned long) nr_pages << PAGE_SHIFT;
+        end = start + len;
         if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
-                                        start, nr_pages*PAGE_SIZE)))
+                                        start, len)))
                 goto slow_irqon;
 
         /*
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index ff3a6a336342..4bdaa590375d 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -23,7 +23,8 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
                 pci_read_config_byte(d, reg++, &busno);
                 pci_read_config_byte(d, reg++, &suba);
                 pci_read_config_byte(d, reg++, &subb);
-                DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb);
+                dev_dbg(&d->dev, "i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno,
+                        suba, subb);
                 if (busno)
                         pci_scan_bus_with_sysdata(busno);       /* Bus A */
                 if (suba < subb)
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index a09505806b82..5807d1bc73f7 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -128,10 +128,8 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!r->start || !pr ||
                                     request_resource(pr, r) < 0) {
-                                        printk(KERN_ERR "PCI: Cannot allocate "
-                                                "resource region %d "
-                                                "of bridge %s\n",
-                                                idx, pci_name(dev));
+                                        dev_err(&dev->dev, "BAR %d: can't "
+                                                "allocate resource\n", idx);
                                         /*
                                          * Something is wrong with the region.
                                          * Invalidate the resource to prevent
@@ -166,15 +164,15 @@ static void __init pcibios_allocate_resources(int pass)
                         else
                                 disabled = !(command & PCI_COMMAND_MEMORY);
                         if (pass == disabled) {
-                                DBG("PCI: Resource %08lx-%08lx "
-                                    "(f=%lx, d=%d, p=%d)\n",
-                                    r->start, r->end, r->flags, disabled, pass);
+                                dev_dbg(&dev->dev, "resource %#08llx-%#08llx "
+                                        "(f=%lx, d=%d, p=%d)\n",
+                                        (unsigned long long) r->start,
+                                        (unsigned long long) r->end,
+                                        r->flags, disabled, pass);
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!pr || request_resource(pr, r) < 0) {
-                                        printk(KERN_ERR "PCI: Cannot allocate "
-                                                "resource region %d "
-                                                "of device %s\n",
-                                                idx, pci_name(dev));
+                                        dev_err(&dev->dev, "BAR %d: can't "
+                                                "allocate resource\n", idx);
                                         /* We'll assign a new address later */
                                         r->end -= r->start;
                                         r->start = 0;
@@ -187,8 +185,7 @@ static void __init pcibios_allocate_resources(int pass)
                                 /* Turn the ROM off, leave the resource region,
                                  * but keep it unregistered. */
                                 u32 reg;
-                                DBG("PCI: Switching off ROM of %s\n",
-                                        pci_name(dev));
+                                dev_dbg(&dev->dev, "disabling ROM\n");
                                 r->flags &= ~IORESOURCE_ROM_ENABLE;
                                 pci_read_config_dword(dev,
                                                 dev->rom_base_reg, &reg);
@@ -257,8 +254,7 @@ void pcibios_set_master(struct pci_dev *dev)
                 lat = pcibios_max_latency;
         else
                 return;
-        printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n",
-                pci_name(dev), lat);
+        dev_printk(KERN_DEBUG, &dev->dev, "setting latency timer to %d\n", lat);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 6a06a2eb0597..fec0123b33a9 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -436,7 +436,7 @@ static int pirq_vlsi_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
 {
         WARN_ON_ONCE(pirq >= 9);
         if (pirq > 8) {
-                printk(KERN_INFO "VLSI router pirq escape (%d)\n", pirq);
+                dev_info(&dev->dev, "VLSI router PIRQ escape (%d)\n", pirq);
                 return 0;
         }
         return read_config_nybble(router, 0x74, pirq-1);
@@ -446,7 +446,7 @@ static int pirq_vlsi_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 {
         WARN_ON_ONCE(pirq >= 9);
         if (pirq > 8) {
-                printk(KERN_INFO "VLSI router pirq escape (%d)\n", pirq);
+                dev_info(&dev->dev, "VLSI router PIRQ escape (%d)\n", pirq);
                 return 0;
         }
         write_config_nybble(router, 0x74, pirq-1, irq);
@@ -492,15 +492,17 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq
         irq = 0;
         if (pirq <= 4)
                 irq = read_config_nybble(router, 0x56, pirq - 1);
-        printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n",
-                dev->vendor, dev->device, pirq, irq);
+        dev_info(&dev->dev,
+                 "AMD756: dev [%04x/%04x], router PIRQ %d get IRQ %d\n",
+                 dev->vendor, dev->device, pirq, irq);
         return irq;
 }
 
 static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
 {
-        printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n",
-                dev->vendor, dev->device, pirq, irq);
+        dev_info(&dev->dev,
+                 "AMD756: dev [%04x/%04x], router PIRQ %d set IRQ %d\n",
+                 dev->vendor, dev->device, pirq, irq);
         if (pirq <= 4)
                 write_config_nybble(router, 0x56, pirq - 1, irq);
         return 1;
@@ -730,7 +732,6 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router,
         switch (device) {
         case PCI_DEVICE_ID_AL_M1533:
         case PCI_DEVICE_ID_AL_M1563:
-                printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n");
                 r->name = "ALI";
                 r->get = pirq_ali_get;
                 r->set = pirq_ali_set;
@@ -840,11 +841,9 @@ static void __init pirq_find_router(struct irq_router *r)
                         h->probe(r, pirq_router_dev, pirq_router_dev->device))
                         break;
         }
-        printk(KERN_INFO "PCI: Using IRQ router %s [%04x/%04x] at %s\n",
-                pirq_router.name,
-                pirq_router_dev->vendor,
-                pirq_router_dev->device,
-                pci_name(pirq_router_dev));
+        dev_info(&pirq_router_dev->dev, "%s IRQ router [%04x/%04x]\n",
+                 pirq_router.name,
+                 pirq_router_dev->vendor, pirq_router_dev->device);
 
         /* The device remains referenced for the kernel lifetime */
 }
@@ -877,7 +876,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         /* Find IRQ pin */
         pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
         if (!pin) {
-                DBG(KERN_DEBUG " -> no interrupt pin\n");
+                dev_dbg(&dev->dev, "no interrupt pin\n");
                 return 0;
         }
         pin = pin - 1;
@@ -887,20 +886,20 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         if (!pirq_table)
                 return 0;
 
-        DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin);
         info = pirq_get_info(dev);
         if (!info) {
-                DBG(" -> not found in routing table\n" KERN_DEBUG);
+                dev_dbg(&dev->dev, "PCI INT %c not found in routing table\n",
+                        'A' + pin);
                 return 0;
         }
         pirq = info->irq[pin].link;
         mask = info->irq[pin].bitmap;
         if (!pirq) {
-                DBG(" -> not routed\n" KERN_DEBUG);
+                dev_dbg(&dev->dev, "PCI INT %c not routed\n", 'A' + pin);
                 return 0;
         }
-        DBG(" -> PIRQ %02x, mask %04x, excl %04x", pirq, mask,
-                pirq_table->exclusive_irqs);
+        dev_dbg(&dev->dev, "PCI INT %c -> PIRQ %02x, mask %04x, excl %04x",
+                'A' + pin, pirq, mask, pirq_table->exclusive_irqs);
         mask &= pcibios_irq_mask;
 
         /* Work around broken HP Pavilion Notebooks which assign USB to
@@ -930,10 +929,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                 if (pci_probe & PCI_USE_PIRQ_MASK)
                         newirq = 0;
                 else
-                        printk("\n" KERN_WARNING
-                                "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n"
-                                KERN_DEBUG, newirq,
-                                pci_name(dev));
+                        dev_warn(&dev->dev, "IRQ %d doesn't match PIRQ mask "
+                                 "%#x; try pci=usepirqmask\n", newirq, mask);
         }
         if (!newirq && assign) {
                 for (i = 0; i < 16; i++) {
@@ -944,39 +941,35 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                                 newirq = i;
                 }
         }
-        DBG(" -> newirq=%d", newirq);
+        dev_dbg(&dev->dev, "PCI INT %c -> newirq %d", 'A' + pin, newirq);
 
         /* Check if it is hardcoded */
         if ((pirq & 0xf0) == 0xf0) {
                 irq = pirq & 0xf;
-                DBG(" -> hardcoded IRQ %d\n", irq);
-                msg = "Hardcoded";
+                msg = "hardcoded";
         } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \
         ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) {
-                DBG(" -> got IRQ %d\n", irq);
-                msg = "Found";
+                msg = "found";
                 eisa_set_level_irq(irq);
         } else if (newirq && r->set &&
                 (dev->class >> 8) != PCI_CLASS_DISPLAY_VGA) {
-                DBG(" -> assigning IRQ %d", newirq);
                 if (r->set(pirq_router_dev, dev, pirq, newirq)) {
                         eisa_set_level_irq(newirq);
-                        DBG(" ... OK\n");
-                        msg = "Assigned";
+                        msg = "assigned";
                         irq = newirq;
                 }
         }
 
         if (!irq) {
-                DBG(" ... failed\n");
                 if (newirq && mask == (1 << newirq)) {
-                        msg = "Guessed";
+                        msg = "guessed";
                         irq = newirq;
-                } else
+                } else {
+                        dev_dbg(&dev->dev, "can't route interrupt\n");
                         return 0;
+                }
         }
-        printk(KERN_INFO "PCI: %s IRQ %d for device %s\n", msg, irq,
-                pci_name(dev));
+        dev_info(&dev->dev, "%s PCI INT %c -> IRQ %d\n", msg, 'A' + pin, irq);
 
         /* Update IRQ for all devices with the same pirq value */
         while ((dev2 = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev2)) != NULL) {
@@ -996,17 +989,17 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                         (!(pci_probe & PCI_USE_PIRQ_MASK) || \
                         ((1 << dev2->irq) & mask))) {
 #ifndef CONFIG_PCI_MSI
-                                printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
-                                       pci_name(dev2), dev2->irq, irq);
+                                dev_info(&dev2->dev, "IRQ routing conflict: "
+                                         "have IRQ %d, want IRQ %d\n",
+                                         dev2->irq, irq);
 #endif
                                 continue;
                         }
                         dev2->irq = irq;
                         pirq_penalty[irq]++;
                         if (dev != dev2)
-                                printk(KERN_INFO
-                                        "PCI: Sharing IRQ %d with %s\n",
-                                        irq, pci_name(dev2));
+                                dev_info(&dev->dev, "sharing IRQ %d with %s\n",
+                                         irq, pci_name(dev2));
                 }
         }
         return 1;
@@ -1025,8 +1018,7 @@ static void __init pcibios_fixup_irqs(void)
                  * already in use.
                  */
                 if (dev->irq >= 16) {
-                        DBG(KERN_DEBUG "%s: ignoring bogus IRQ %d\n",
-                                pci_name(dev), dev->irq);
+                        dev_dbg(&dev->dev, "ignoring bogus IRQ %d\n", dev->irq);
                         dev->irq = 0;
                 }
                 /*
@@ -1070,12 +1062,12 @@ static void __init pcibios_fixup_irqs(void)
                                         irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
                                                         PCI_SLOT(bridge->devfn), pin);
                                         if (irq >= 0)
-                                                printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n",
-                                                        pci_name(bridge), 'A' + pin, irq);
+                                                dev_warn(&dev->dev, "using bridge %s INT %c to get IRQ %d\n",
+                                                         pci_name(bridge),
+                                                         'A' + pin, irq);
                                 }
                                 if (irq >= 0) {
-                                        printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
-                                                pci_name(dev), 'A' + pin, irq);
+                                        dev_info(&dev->dev, "PCI->APIC IRQ transform: INT %c -> IRQ %d\n", 'A' + pin, irq);
                                         dev->irq = irq;
                                 }
                         }
@@ -1231,25 +1223,24 @@ static int pirq_enable_irq(struct pci_dev *dev)
                                 irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
                                                 PCI_SLOT(bridge->devfn), pin);
                                 if (irq >= 0)
-                                        printk(KERN_WARNING
-                                                "PCI: using PPB %s[%c] to get irq %d\n",
-                                                pci_name(bridge),
-                                                'A' + pin, irq);
+                                        dev_warn(&dev->dev, "using bridge %s "
+                                                 "INT %c to get IRQ %d\n",
+                                                 pci_name(bridge), 'A' + pin,
+                                                 irq);
                                 dev = bridge;
                         }
                         dev = temp_dev;
                         if (irq >= 0) {
-                                printk(KERN_INFO
-                                        "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
-                                        pci_name(dev), 'A' + pin, irq);
+                                dev_info(&dev->dev, "PCI->APIC IRQ transform: "
+                                         "INT %c -> IRQ %d\n", 'A' + pin, irq);
                                 dev->irq = irq;
                                 return 0;
                         } else
-                                msg = " Probably buggy MP table.";
+                                msg = "; probably buggy MP table";
                 } else if (pci_probe & PCI_BIOS_IRQ_SCAN)
                         msg = "";
                 else
-                        msg = " Please try using pci=biosirq.";
+                        msg = "; please try using pci=biosirq";
 
                 /*
                  * With IDE legacy devices the IRQ lookup failure is not
@@ -1259,9 +1250,8 @@ static int pirq_enable_irq(struct pci_dev *dev)
                                 !(dev->class & 0x5))
                         return 0;
 
-                printk(KERN_WARNING
-                        "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",
-                        'A' + pin, pci_name(dev), msg);
+                dev_warn(&dev->dev, "can't find IRQ for PCI INT %c%s\n",
+                         'A' + pin, msg);
         }
         return 0;
 }
diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
index f4b16dc11dad..1177845d3186 100644
--- a/arch/x86/pci/numaq_32.c
+++ b/arch/x86/pci/numaq_32.c
@@ -131,13 +131,14 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
         u8 busno, suba, subb;
         int quad = BUS2QUAD(d->bus->number);
 
-        printk("PCI: Searching for i450NX host bridges on %s\n", pci_name(d));
+        dev_info(&d->dev, "searching for i450NX host bridges\n");
         reg = 0xd0;
         for(pxb=0; pxb<2; pxb++) {
                 pci_read_config_byte(d, reg++, &busno);
                 pci_read_config_byte(d, reg++, &suba);
                 pci_read_config_byte(d, reg++, &subb);
-                DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb);
+                dev_dbg(&d->dev, "i450NX PXB %d: %02x/%02x/%02x\n",
+                        pxb, busno, suba, subb);
                 if (busno) {
                         /* Bus A */
                         pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, busno));
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index dd376f7ad090..d5b4ef898879 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -76,9 +76,9 @@ static struct acpi_pci_driver acpi_pci_slot_driver = {
 };
 
 static int
-check_slot(acpi_handle handle, int *device, unsigned long *sun)
+check_slot(acpi_handle handle, unsigned long *sun)
 {
-        int retval = 0;
+        int device = -1;
         unsigned long adr, sta;
         acpi_status status;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -89,32 +89,27 @@ check_slot(acpi_handle handle, int *device, unsigned long *sun)
         if (check_sta_before_sun) {
                 /* If SxFy doesn't have _STA, we just assume it's there */
                 status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-                if (ACPI_SUCCESS(status) && !(sta & ACPI_STA_DEVICE_PRESENT)) {
-                        retval = -1;
+                if (ACPI_SUCCESS(status) && !(sta & ACPI_STA_DEVICE_PRESENT))
                         goto out;
-                }
         }
 
         status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
         if (ACPI_FAILURE(status)) {
                 dbg("_ADR returned %d on %s\n", status, (char *)buffer.pointer);
-                retval = -1;
                 goto out;
         }
 
-        *device = (adr >> 16) & 0xffff;
-
         /* No _SUN == not a slot == bail */
         status = acpi_evaluate_integer(handle, "_SUN", NULL, sun);
         if (ACPI_FAILURE(status)) {
                 dbg("_SUN returned %d on %s\n", status, (char *)buffer.pointer);
-                retval = -1;
                 goto out;
         }
 
+        device = (adr >> 16) & 0xffff;
 out:
         kfree(buffer.pointer);
-        return retval;
+        return device;
 }
 
 struct callback_args {
@@ -144,7 +139,8 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         struct callback_args *parent_context = context;
         struct pci_bus *pci_bus = parent_context->pci_bus;
 
-        if (check_slot(handle, &device, &sun))
+        device = check_slot(handle, &sun);
+        if (device < 0)
                 return AE_OK;
 
         slot = kmalloc(sizeof(*slot), GFP_KERNEL);
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index b7f2963693a7..283c08f5f4d4 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1332,9 +1332,15 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
         if (!pr->flags.power_setup_done)
                 return -ENODEV;
 
-        /* Fall back to the default idle loop */
-        pm_idle = pm_idle_save;
-        synchronize_sched();    /* Relies on interrupts forcing exit from idle. */
+        /*
+         * Fall back to the default idle loop, when pm_idle_save had
+         * been initialized.
+         */
+        if (pm_idle_save) {
+                pm_idle = pm_idle_save;
+                /* Relies on interrupts forcing exit from idle. */
+                synchronize_sched();
+        }
 
         pr->flags.power = 0;
         result = acpi_processor_get_power_info(pr);
@@ -1896,7 +1902,8 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
 
         /* Unregister the idle handler when processor #0 is removed. */
         if (pr->id == 0) {
-                pm_idle = pm_idle_save;
+                if (pm_idle_save)
+                        pm_idle = pm_idle_save;
 
                 /*
                  * We are about to unload the current idle thread pm callback
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index a2c3f9cfa549..a56fc6c4394b 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -827,7 +827,6 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 static int acpi_processor_get_throttling(struct acpi_processor *pr)
 {
         cpumask_t saved_mask;
-        cpumask_of_cpu_ptr_declare(new_mask);
         int ret;
 
         if (!pr)
@@ -839,8 +838,7 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)
          * Migrate task to the cpu pointed by pr.
          */
         saved_mask = current->cpus_allowed;
-        cpumask_of_cpu_ptr_next(new_mask, pr->id);
-        set_cpus_allowed_ptr(current, new_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(pr->id));
         ret = pr->throttling.acpi_processor_get_throttling(pr);
         /* restore the previous state */
         set_cpus_allowed_ptr(current, &saved_mask);
@@ -989,7 +987,6 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
 int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
 {
         cpumask_t saved_mask;
-        cpumask_of_cpu_ptr_declare(new_mask);
         int ret = 0;
         unsigned int i;
         struct acpi_processor *match_pr;
@@ -1028,8 +1025,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
          * it can be called only for the cpu pointed by pr.
          */
         if (p_throttling->shared_type == DOMAIN_COORD_TYPE_SW_ANY) {
-                cpumask_of_cpu_ptr_next(new_mask, pr->id);
-                set_cpus_allowed_ptr(current, new_mask);
+                set_cpus_allowed_ptr(current, &cpumask_of_cpu(pr->id));
                 ret = p_throttling->acpi_processor_set_throttling(pr,
                                                 t_state.target_state);
         } else {
@@ -1060,8 +1056,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
                                 continue;
                         }
                         t_state.cpu = i;
-                        cpumask_of_cpu_ptr_next(new_mask, i);
-                        set_cpus_allowed_ptr(current, new_mask);
+                        set_cpus_allowed_ptr(current, &cpumask_of_cpu(i));
                         ret = match_pr->throttling.
                                 acpi_processor_set_throttling(
                                 match_pr, t_state.target_state);
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index de8d186f5abf..2014253f6c88 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -169,7 +169,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq)
-                set_irq_type(irq, IRQT_RISING);
+                set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
 
         /* Setup expansion bus chip selects */
         *data->cs0_cfg = data->cs0_bits;
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3ad49a00029f..af0d175c025d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -103,7 +103,8 @@ static ssize_t show_mem_phys_index(struct sys_device *dev,
 /*
  * Show whether the section of memory is likely to be hot-removable
  */
-static ssize_t show_mem_removable(struct sys_device *dev, char *buf)
+static ssize_t show_mem_removable(struct sys_device *dev,
+                        struct sysdev_attribute *attr, char *buf)
 {
         unsigned long start_pfn;
         int ret;
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index 27fdc0866496..8a2fce0756ec 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -241,7 +241,7 @@ static int __init intel_rng_hw_init(void *_intel_rng_hw)
         struct intel_rng_hw *intel_rng_hw = _intel_rng_hw;
         u8 mfc, dvc;
 
-        /* interrupts disabled in stop_machine_run call */
+        /* interrupts disabled in stop_machine call */
 
         if (!(intel_rng_hw->fwh_dec_en1_val & FWH_F8_EN_MASK))
                 pci_write_config_byte(intel_rng_hw->dev,
@@ -365,10 +365,10 @@ static int __init mod_init(void)
          * location with the Read ID command, all activity on the system
          * must be stopped until the state is back to normal.
          *
-         * Use stop_machine_run because IPIs can be blocked by disabling
+         * Use stop_machine because IPIs can be blocked by disabling
          * interrupts.
          */
-        err = stop_machine_run(intel_rng_hw_init, intel_rng_hw, NR_CPUS);
+        err = stop_machine(intel_rng_hw_init, intel_rng_hw, NULL);
         pci_dev_put(dev);
         iounmap(intel_rng_hw->mem);
         kfree(intel_rng_hw);
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index f9f72a211292..006be92ee3f3 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size,
         ssize_t ret;
 
         if (flashdebug)
-                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, "
-                       "buffer=%p, count=0x%X.\n", p, buf, count);
+                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, "
+                       "buffer=%p, count=0x%zx.\n", *ppos, buf, size);
         /*
          * We now lock against reads and writes. --rmk
          */
         if (mutex_lock_interruptible(&nwflash_mutex))
                 return -ERESTARTSYS;
 
-        ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize);
+        ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize);
         mutex_unlock(&nwflash_mutex);
 
         return ret;
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 929101ecbae2..4c1820cad712 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -30,11 +30,11 @@
 static void ipw_send_setup_packet(struct ipw_hardware *hw);
 static void handle_received_SETUP_packet(struct ipw_hardware *ipw,
                                          unsigned int address,
-                                         unsigned char *data, int len,
+                                         const unsigned char *data, int len,
                                          int is_last);
 static void ipwireless_setup_timer(unsigned long data);
 static void handle_received_CTRL_packet(struct ipw_hardware *hw,
-                unsigned int channel_idx, unsigned char *data, int len);
+                unsigned int channel_idx, const unsigned char *data, int len);
 
 /*#define TIMING_DIAGNOSTICS*/
 
@@ -79,8 +79,7 @@ static void report_timing(void)
                 timing_stats.last_report_time = jiffies;
                 if (!first)
                         printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": %u us elapsed - read %lu bytes in %u us, "
-                               "wrote %lu bytes in %u us\n",
+                               ": %u us elapsed - read %lu bytes in %u us, wrote %lu bytes in %u us\n",
                                jiffies_to_usecs(since),
                                timing_stats.read_bytes,
                                jiffies_to_usecs(timing_stats.read_time),
@@ -133,29 +132,17 @@ enum {
 #define NL_FOLLOWING_PACKET_HEADER_SIZE    1
 
 struct nl_first_packet_header {
-#if defined(__BIG_ENDIAN_BITFIELD)
-        unsigned char packet_rank:2;
-        unsigned char address:3;
-        unsigned char protocol:3;
-#else
         unsigned char protocol:3;
         unsigned char address:3;
         unsigned char packet_rank:2;
-#endif
         unsigned char length_lsb;
         unsigned char length_msb;
 };
 
 struct nl_packet_header {
-#if defined(__BIG_ENDIAN_BITFIELD)
-        unsigned char packet_rank:2;
-        unsigned char address:3;
-        unsigned char protocol:3;
-#else
         unsigned char protocol:3;
         unsigned char address:3;
         unsigned char packet_rank:2;
-#endif
 };
 
 /* Value of 'packet_rank' above */
@@ -227,15 +214,12 @@ struct MEMINFREG {
         unsigned short memreg_tx_new;   /* TX2 (new) Register (R/W) */
 };
 
-#define IODMADPR 0x00           /* DMA Data Port Register (R/W) */
-
 #define CARD_PRESENT_VALUE (0xBEEFCAFEUL)
 
 #define MEMTX_TX                       0x0001
 #define MEMRX_RX                       0x0001
 #define MEMRX_RX_DONE                  0x0001
 #define MEMRX_PCINTACKK                0x0001
-#define MEMRX_MEMSPURIOUSINT           0x0001
 
 #define NL_NUM_OF_PRIORITIES       3
 #define NL_NUM_OF_PROTOCOLS        3
@@ -245,7 +229,7 @@ struct ipw_hardware {
         unsigned int base_port;
         short hw_version;
         unsigned short ll_mtu;
-        spinlock_t spinlock;
+        spinlock_t lock;
 
         int initializing;
         int init_loops;
@@ -386,26 +370,52 @@ static void dump_data_bytes(const char *type, const unsigned char *data,
                         length < DUMP_MAX_BYTES ? length : DUMP_MAX_BYTES);
 }
 
-static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data,
+static void swap_packet_bitfield_to_le(unsigned char *data)
+{
+#ifdef __BIG_ENDIAN_BITFIELD
+        unsigned char tmp = *data, ret = 0;
+
+        /*
+         * transform bits from aa.bbb.ccc to ccc.bbb.aa
+         */
+        ret |= tmp & 0xc0 >> 6;
+        ret |= tmp & 0x38 >> 1;
+        ret |= tmp & 0x07 << 5;
+        *data = ret & 0xff;
+#endif
+}
+
+static void swap_packet_bitfield_from_le(unsigned char *data)
+{
+#ifdef __BIG_ENDIAN_BITFIELD
+        unsigned char tmp = *data, ret = 0;
+
+        /*
+         * transform bits from ccc.bbb.aa to aa.bbb.ccc
+         */
+        ret |= tmp & 0xe0 >> 5;
+        ret |= tmp & 0x1c << 1;
+        ret |= tmp & 0x03 << 6;
+        *data = ret & 0xff;
+#endif
+}
+
+static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data,
                             unsigned length)
 {
-        int i;
+        unsigned i;
         unsigned long flags;
 
         start_timing();
-
-        if (length == 0)
-                return 0;
-
-        if (length > hw->ll_mtu)
-                return -1;
+        BUG_ON(length > hw->ll_mtu);
 
         if (ipwireless_debug)
                 dump_data_bytes("send", data, length);
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
 
         hw->tx_ready = 0;
+        swap_packet_bitfield_to_le(data);
 
         if (hw->hw_version == HW_VERSION_1) {
                 outw((unsigned short) length, hw->base_port + IODWR);
@@ -414,7 +424,7 @@ static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data,
                         unsigned short d = data[i];
                         __le16 raw_data;
 
-                        if (likely(i + 1 < length))
+                        if (i + 1 < length)
                                 d |= data[i + 1] << 8;
                         raw_data = cpu_to_le16(d);
                         outw(raw_data, hw->base_port + IODWR);
@@ -422,32 +432,30 @@ static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data,
 
                 outw(DCR_TXDONE, hw->base_port + IODCR);
         } else if (hw->hw_version == HW_VERSION_2) {
-                outw((unsigned short) length, hw->base_port + IODMADPR);
+                outw((unsigned short) length, hw->base_port);
 
                 for (i = 0; i < length; i += 2) {
                         unsigned short d = data[i];
                         __le16 raw_data;
 
-                        if ((i + 1 < length))
+                        if (i + 1 < length)
                                 d |= data[i + 1] << 8;
                         raw_data = cpu_to_le16(d);
-                        outw(raw_data, hw->base_port + IODMADPR);
+                        outw(raw_data, hw->base_port);
                 }
                 while ((i & 3) != 2) {
-                        outw((unsigned short) 0xDEAD, hw->base_port + IODMADPR);
+                        outw((unsigned short) 0xDEAD, hw->base_port);
                         i += 2;
                 }
                 writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx);
         }
 
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 
         end_write_timing(length);
-
-        return 0;
 }
 
-static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
+static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
 {
         unsigned short fragment_data_len;
         unsigned short data_left = packet->length - packet->offset;
@@ -462,6 +470,10 @@ static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
         if (data_left < fragment_data_len)
                 fragment_data_len = data_left;
 
+        /*
+         * hdr_first is now in machine bitfield order, which will be swapped
+         * to le just before it goes to hw
+         */
         pkt.hdr_first.protocol = packet->protocol;
         pkt.hdr_first.address = packet->dest_addr;
         pkt.hdr_first.packet_rank = 0;
@@ -493,25 +505,23 @@ static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
                  */
                 unsigned long flags;
 
-                spin_lock_irqsave(&hw->spinlock, flags);
+                spin_lock_irqsave(&hw->lock, flags);
                 list_add(&packet->queue, &hw->tx_queue[0]);
                 hw->tx_queued++;
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
         } else {
                 if (packet->packet_callback)
                         packet->packet_callback(packet->callback_data,
                                         packet->length);
                 kfree(packet);
         }
-
-        return 0;
 }
 
 static void ipw_setup_hardware(struct ipw_hardware *hw)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         if (hw->hw_version == HW_VERSION_1) {
                 /* Reset RX FIFO */
                 outw(DCR_RXRESET, hw->base_port + IODCR);
@@ -530,7 +540,7 @@ static void ipw_setup_hardware(struct ipw_hardware *hw)
                 csr |= 1;
                 writew(csr, &hw->memregs_CCR->reg_config_and_status);
         }
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 }
 
 /*
@@ -549,28 +559,23 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
         if (!packet) {
                 unsigned long flags;
 
-                /*
-                 * If this is the first fragment, then we will need to fetch a
-                 * packet to put it in.
-                 */
-                spin_lock_irqsave(&hw->spinlock, flags);
-                /* If we have one in our pool, then pull it out. */
+                spin_lock_irqsave(&hw->lock, flags);
                 if (!list_empty(&hw->rx_pool)) {
                         packet = list_first_entry(&hw->rx_pool,
                                         struct ipw_rx_packet, queue);
-                        list_del(&packet->queue);
                         hw->rx_pool_size--;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
+                        list_del(&packet->queue);
                 } else {
-                        /* Otherwise allocate a new one. */
-                        static int min_capacity = 256;
+                        const int min_capacity =
+                                ipwireless_ppp_mru(hw->network) + 2;
                         int new_capacity;
 
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                         new_capacity =
-                            minimum_free_space > min_capacity
-                            ? minimum_free_space
-                            : min_capacity;
+                                (minimum_free_space > min_capacity
+                                 ? minimum_free_space
+                                 : min_capacity);
                         packet = kmalloc(sizeof(struct ipw_rx_packet)
                                         + new_capacity, GFP_ATOMIC);
                         if (!packet)
@@ -580,10 +585,6 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
                 packet->length = 0;
         }
 
-        /*
-         * If this packet does not have sufficient capacity for the data we
-         * want to add, then make it bigger.
-         */
         if (packet->length + minimum_free_space > packet->capacity) {
                 struct ipw_rx_packet *old_packet = packet;
 
@@ -610,13 +611,15 @@ static void pool_free(struct ipw_hardware *hw, struct ipw_rx_packet *packet)
                 kfree(packet);
         else {
                 hw->rx_pool_size++;
-                list_add_tail(&packet->queue, &hw->rx_pool);
+                list_add(&packet->queue, &hw->rx_pool);
         }
 }
 
 static void queue_received_packet(struct ipw_hardware *hw,
-                                  unsigned int protocol, unsigned int address,
-                                  unsigned char *data, int length, int is_last)
+                                  unsigned int protocol,
+                                  unsigned int address,
+                                  const unsigned char *data, int length,
+                                  int is_last)
 {
         unsigned int channel_idx = address - 1;
         struct ipw_rx_packet *packet = NULL;
@@ -658,9 +661,9 @@ static void queue_received_packet(struct ipw_hardware *hw,
                         packet = *assem;
                         *assem = NULL;
                         /* Count queued DATA bytes only */
-                        spin_lock_irqsave(&hw->spinlock, flags);
+                        spin_lock_irqsave(&hw->lock, flags);
                         hw->rx_bytes_queued += packet->length;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                 }
         } else {
                 /* If it's a CTRL packet, don't assemble, just queue it. */
@@ -682,13 +685,13 @@ static void queue_received_packet(struct ipw_hardware *hw,
          * network layer.
          */
         if (packet) {
-                spin_lock_irqsave(&hw->spinlock, flags);
+                spin_lock_irqsave(&hw->lock, flags);
                 list_add_tail(&packet->queue, &hw->rx_queue);
                 /* Block reception of incoming packets if queue is full. */
                 hw->blocking_rx =
-                        hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE;
+                        (hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE);
 
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
                 schedule_work(&hw->work_rx);
         }
 }
@@ -702,7 +705,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx)
             container_of(work_rx, struct ipw_hardware, work_rx);
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         while (!list_empty(&hw->rx_queue)) {
                 struct ipw_rx_packet *packet =
                         list_first_entry(&hw->rx_queue,
@@ -720,7 +723,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx)
                 if (packet->protocol == TL_PROTOCOLID_COM_DATA) {
                         if (hw->network != NULL) {
                                 /* If the network hasn't been disconnected. */
-                                spin_unlock_irqrestore(&hw->spinlock, flags);
+                                spin_unlock_irqrestore(&hw->lock, flags);
                                 /*
                                  * This must run unlocked due to tty processing
                                  * and mutex locking
@@ -731,7 +734,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx)
                                                 (unsigned char *)packet
                                                 + sizeof(struct ipw_rx_packet),
                                                 packet->length);
-                                spin_lock_irqsave(&hw->spinlock, flags);
+                                spin_lock_irqsave(&hw->lock, flags);
                         }
                         /* Count queued DATA bytes only */
                         hw->rx_bytes_queued -= packet->length;
@@ -755,15 +758,15 @@ static void ipw_receive_data_work(struct work_struct *work_rx)
                 if (hw->shutting_down)
                         break;
         }
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 }
 
 static void handle_received_CTRL_packet(struct ipw_hardware *hw,
                                         unsigned int channel_idx,
-                                        unsigned char *data, int len)
+                                        const unsigned char *data, int len)
 {
-        struct ipw_control_packet_body *body =
-                (struct ipw_control_packet_body *) data;
+        const struct ipw_control_packet_body *body =
+                (const struct ipw_control_packet_body *) data;
         unsigned int changed_mask;
 
         if (len != sizeof(struct ipw_control_packet_body)) {
@@ -805,13 +808,13 @@ static void handle_received_CTRL_packet(struct ipw_hardware *hw,
 }
 
 static void handle_received_packet(struct ipw_hardware *hw,
-                                   union nl_packet *packet,
+                                   const union nl_packet *packet,
                                    unsigned short len)
 {
         unsigned int protocol = packet->hdr.protocol;
         unsigned int address = packet->hdr.address;
         unsigned int header_length;
-        unsigned char *data;
+        const unsigned char *data;
         unsigned int data_len;
         int is_last = packet->hdr.packet_rank & NL_LAST_PACKET;
 
@@ -850,7 +853,7 @@ static void acknowledge_data_read(struct ipw_hardware *hw)
 static void do_receive_packet(struct ipw_hardware *hw)
 {
         unsigned len;
-        unsigned int i;
+        unsigned i;
         unsigned char pkt[LL_MTU_MAX];
 
         start_timing();
@@ -859,8 +862,7 @@ static void do_receive_packet(struct ipw_hardware *hw)
                 len = inw(hw->base_port + IODRR);
                 if (len > hw->ll_mtu) {
                         printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": received a packet of %u bytes - "
-                               "longer than the MTU!\n", len);
+                               ": received a packet of %u bytes - longer than the MTU!\n", len);
                         outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR);
                         return;
                 }
@@ -873,18 +875,17 @@ static void do_receive_packet(struct ipw_hardware *hw)
                         pkt[i + 1] = (unsigned char) (data >> 8);
                 }
         } else {
-                len = inw(hw->base_port + IODMADPR);
+                len = inw(hw->base_port);
                 if (len > hw->ll_mtu) {
                         printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": received a packet of %u bytes - "
-                               "longer than the MTU!\n", len);
+                               ": received a packet of %u bytes - longer than the MTU!\n", len);
                         writew(MEMRX_PCINTACKK,
                                 &hw->memory_info_regs->memreg_pc_interrupt_ack);
                         return;
                 }
 
                 for (i = 0; i < len; i += 2) {
-                        __le16 raw_data = inw(hw->base_port + IODMADPR);
+                        __le16 raw_data = inw(hw->base_port);
                         unsigned short data = le16_to_cpu(raw_data);
 
                         pkt[i] = (unsigned char) data;
@@ -892,13 +893,15 @@ static void do_receive_packet(struct ipw_hardware *hw)
                 }
 
                 while ((i & 3) != 2) {
-                        inw(hw->base_port + IODMADPR);
+                        inw(hw->base_port);
                         i += 2;
                 }
         }
 
         acknowledge_data_read(hw);
 
+        swap_packet_bitfield_from_le(pkt);
+
         if (ipwireless_debug)
                 dump_data_bytes("recv", pkt, len);
 
@@ -916,8 +919,7 @@ static int get_current_packet_priority(struct ipw_hardware *hw)
          * until setup is complete.
          */
         return (hw->to_setup || hw->initializing
-                        ? PRIO_SETUP + 1 :
-                        NL_NUM_OF_PRIORITIES);
+                        ? PRIO_SETUP + 1 : NL_NUM_OF_PRIORITIES);
 }
 
 /*
@@ -928,17 +930,17 @@ static int get_packets_from_hw(struct ipw_hardware *hw)
         int received = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         while (hw->rx_ready && !hw->blocking_rx) {
                 received = 1;
                 hw->rx_ready--;
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
 
                 do_receive_packet(hw);
 
-                spin_lock_irqsave(&hw->spinlock, flags);
+                spin_lock_irqsave(&hw->lock, flags);
         }
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 
         return received;
 }
@@ -954,7 +956,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)
         int more_to_send = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         if (hw->tx_queued && hw->tx_ready) {
                 int priority;
                 struct ipw_tx_packet *packet = NULL;
@@ -975,17 +977,17 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)
                 }
                 if (!packet) {
                         hw->tx_queued = 0;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                         return 0;
                 }
 
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
 
                 /* Send */
                 do_send_packet(hw, packet);
 
                 /* Check if more to send */
-                spin_lock_irqsave(&hw->spinlock, flags);
+                spin_lock_irqsave(&hw->lock, flags);
                 for (priority = 0; priority < priority_limit; priority++)
                         if (!list_empty(&hw->tx_queue[priority])) {
                                 more_to_send = 1;
@@ -995,7 +997,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)
                 if (!more_to_send)
                         hw->tx_queued = 0;
         }
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 
         return more_to_send;
 }
@@ -1008,9 +1010,9 @@ static void ipwireless_do_tasklet(unsigned long hw_)
         struct ipw_hardware *hw = (struct ipw_hardware *) hw_;
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         if (hw->shutting_down) {
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
                 return;
         }
 
@@ -1019,7 +1021,7 @@ static void ipwireless_do_tasklet(unsigned long hw_)
                  * Initial setup data sent to hardware
                  */
                 hw->to_setup = 2;
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
 
                 ipw_setup_hardware(hw);
                 ipw_send_setup_packet(hw);
@@ -1030,7 +1032,7 @@ static void ipwireless_do_tasklet(unsigned long hw_)
                 int priority_limit = get_current_packet_priority(hw);
                 int again;
 
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
 
                 do {
                         again = send_pending_packet(hw, priority_limit);
@@ -1068,16 +1070,16 @@ static irqreturn_t ipwireless_handle_v1_interrupt(int irq,
                 /* Transmit complete. */
                 if (irqn & IR_TXINTR) {
                         ack |= IR_TXINTR;
-                        spin_lock_irqsave(&hw->spinlock, flags);
+                        spin_lock_irqsave(&hw->lock, flags);
                         hw->tx_ready = 1;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                 }
                 /* Received data */
                 if (irqn & IR_RXINTR) {
                         ack |= IR_RXINTR;
-                        spin_lock_irqsave(&hw->spinlock, flags);
+                        spin_lock_irqsave(&hw->lock, flags);
                         hw->rx_ready++;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                 }
                 if (ack != 0) {
                         outw(ack, hw->base_port + IOIR);
@@ -1128,9 +1130,8 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
                         } else {
                                 return IRQ_NONE;
                         }
-                } else {
+                } else
                         return IRQ_NONE;
-                }
         }
 
         /*
@@ -1149,9 +1150,9 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
                 if (hw->serial_number_detected) {
                         if (memtx_serial != hw->last_memtx_serial) {
                                 hw->last_memtx_serial = memtx_serial;
-                                spin_lock_irqsave(&hw->spinlock, flags);
+                                spin_lock_irqsave(&hw->lock, flags);
                                 hw->rx_ready++;
-                                spin_unlock_irqrestore(&hw->spinlock, flags);
+                                spin_unlock_irqrestore(&hw->lock, flags);
                                 rx = 1;
                         } else
                                 /* Ignore 'Timer Recovery' duplicates. */
@@ -1166,18 +1167,18 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
                                 printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
                                         ": memreg_tx serial num detected\n");
 
-                                spin_lock_irqsave(&hw->spinlock, flags);
+                                spin_lock_irqsave(&hw->lock, flags);
                                 hw->rx_ready++;
-                                spin_unlock_irqrestore(&hw->spinlock, flags);
+                                spin_unlock_irqrestore(&hw->lock, flags);
                         }
                         rx = 1;
                 }
         }
         if (memrxdone & MEMRX_RX_DONE) {
                 writew(0, &hw->memory_info_regs->memreg_rx_done);
-                spin_lock_irqsave(&hw->spinlock, flags);
+                spin_lock_irqsave(&hw->lock, flags);
                 hw->tx_ready = 1;
-                spin_unlock_irqrestore(&hw->spinlock, flags);
+                spin_unlock_irqrestore(&hw->lock, flags);
                 tx = 1;
         }
         if (tx)
@@ -1195,8 +1196,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
                                         ": spurious interrupt - new_tx mode\n");
                         else {
                                 printk(KERN_WARNING IPWIRELESS_PCCARD_NAME
-                                        ": no valid memreg_tx value - "
-                                        "switching to the old memreg_tx\n");
+                                        ": no valid memreg_tx value - switching to the old memreg_tx\n");
                                 hw->memreg_tx =
                                         &hw->memory_info_regs->memreg_tx_old;
                                 try_mem_tx_old = 1;
@@ -1211,7 +1211,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
         return IRQ_HANDLED;
 }
 
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t ipwireless_interrupt(int irq, void *dev_id)
 {
         struct ipw_hardware *hw = dev_id;
 
@@ -1226,9 +1226,9 @@ static void flush_packets_to_hw(struct ipw_hardware *hw)
         int priority_limit;
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         priority_limit = get_current_packet_priority(hw);
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 
         while (send_pending_packet(hw, priority_limit));
 }
@@ -1238,10 +1238,10 @@ static void send_packet(struct ipw_hardware *hw, int priority,
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&hw->spinlock, flags);
+        spin_lock_irqsave(&hw->lock, flags);
         list_add_tail(&packet->queue, &hw->tx_queue[priority]);
         hw->tx_queued++;
-        spin_unlock_irqrestore(&hw->spinlock, flags);
+        spin_unlock_irqrestore(&hw->lock, flags);
 
         flush_packets_to_hw(hw);
 }
@@ -1291,21 +1291,20 @@ static void *alloc_ctrl_packet(int header_size,
 }
 
 int ipwireless_send_packet(struct ipw_hardware *hw, unsigned int channel_idx,
-                            unsigned char *data, unsigned int length,
+                            const unsigned char *data, unsigned int length,
                             void (*callback) (void *cb, unsigned int length),
                             void *callback_data)
 {
         struct ipw_tx_packet *packet;
 
-        packet = alloc_data_packet(length,
-                               (unsigned char) (channel_idx + 1),
-                               TL_PROTOCOLID_COM_DATA);
+        packet = alloc_data_packet(length, (channel_idx + 1),
+                        TL_PROTOCOLID_COM_DATA);
         if (!packet)
                 return -ENOMEM;
         packet->packet_callback = callback;
         packet->callback_data = callback_data;
-        memcpy((unsigned char *) packet +
-                        sizeof(struct ipw_tx_packet), data, length);
+        memcpy((unsigned char *) packet + sizeof(struct ipw_tx_packet), data,
+                        length);
 
         send_packet(hw, PRIO_DATA, packet);
         return 0;
@@ -1321,12 +1320,11 @@ static int set_control_line(struct ipw_hardware *hw, int prio,
                 protocolid = TL_PROTOCOLID_SETUP;
 
         packet = alloc_ctrl_packet(sizeof(struct ipw_control_packet),
-                        (unsigned char) (channel_idx + 1),
-                        protocolid, line);
+                        (channel_idx + 1), protocolid, line);
         if (!packet)
                 return -ENOMEM;
         packet->header.length = sizeof(struct ipw_control_packet_body);
-        packet->body.value = (unsigned char) (state == 0 ? 0 : 1);
+        packet->body.value = (state == 0 ? 0 : 1);
         send_packet(hw, prio, &packet->header);
         return 0;
 }
@@ -1504,8 +1502,7 @@ static void handle_setup_get_version_rsp(struct ipw_hardware *hw,
         if (vers_no == TL_SETUP_VERSION)
                 __handle_setup_get_version_rsp(hw);
         else
-                printk(KERN_ERR
-                                IPWIRELESS_PCCARD_NAME
+                printk(KERN_ERR IPWIRELESS_PCCARD_NAME
                                 ": invalid hardware version no %u\n",
                                 (unsigned int) vers_no);
 }
@@ -1528,10 +1525,10 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw)
 
 static void handle_received_SETUP_packet(struct ipw_hardware *hw,
                                          unsigned int address,
-                                         unsigned char *data, int len,
+                                         const unsigned char *data, int len,
                                          int is_last)
 {
-        union ipw_setup_rx_msg *rx_msg = (union ipw_setup_rx_msg *) data;
+        const union ipw_setup_rx_msg *rx_msg = (const union ipw_setup_rx_msg *) data;
 
         if (address != ADDR_SETUP_PROT) {
                 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
@@ -1629,7 +1626,7 @@ struct ipw_hardware *ipwireless_hardware_create(void)
 
         INIT_LIST_HEAD(&hw->rx_queue);
         INIT_LIST_HEAD(&hw->rx_pool);
-        spin_lock_init(&hw->spinlock);
+        spin_lock_init(&hw->lock);
         tasklet_init(&hw->tasklet, ipwireless_do_tasklet, (unsigned long) hw);
         INIT_WORK(&hw->work_rx, ipw_receive_data_work);
         setup_timer(&hw->setup_timer, ipwireless_setup_timer,
@@ -1651,8 +1648,8 @@ void ipwireless_init_hardware_v1(struct ipw_hardware *hw,
                 enable_irq(hw->irq);
         }
         hw->base_port = base_port;
-        hw->hw_version = is_v2_card ? HW_VERSION_2 : HW_VERSION_1;
-        hw->ll_mtu = hw->hw_version == HW_VERSION_1 ? LL_MTU_V1 : LL_MTU_V2;
+        hw->hw_version = (is_v2_card ? HW_VERSION_2 : HW_VERSION_1);
+        hw->ll_mtu = (hw->hw_version == HW_VERSION_1 ? LL_MTU_V1 : LL_MTU_V2);
         hw->memregs_CCR = (struct MEMCCR __iomem *)
                         ((unsigned short __iomem *) attr_memory + 0x200);
         hw->memory_info_regs = (struct MEMINFREG __iomem *) common_memory;
@@ -1695,10 +1692,10 @@ static void ipwireless_setup_timer(unsigned long data)
                 if (is_card_present(hw)) {
                         unsigned long flags;
 
-                        spin_lock_irqsave(&hw->spinlock, flags);
+                        spin_lock_irqsave(&hw->lock, flags);
                         hw->to_setup = 1;
                         hw->tx_ready = 1;
-                        spin_unlock_irqrestore(&hw->spinlock, flags);
+                        spin_unlock_irqrestore(&hw->lock, flags);
                         tasklet_schedule(&hw->tasklet);
                 }
 
diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/char/pcmcia/ipwireless/hardware.h
index 19ce5eb266b1..90a8590e43b0 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.h
+++ b/drivers/char/pcmcia/ipwireless/hardware.h
@@ -34,14 +34,14 @@ struct ipw_network;
 
 struct ipw_hardware *ipwireless_hardware_create(void);
 void ipwireless_hardware_free(struct ipw_hardware *hw);
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t ipwireless_interrupt(int irq, void *dev_id);
 int ipwireless_set_DTR(struct ipw_hardware *hw, unsigned int channel_idx,
                 int state);
 int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx,
                 int state);
 int ipwireless_send_packet(struct ipw_hardware *hw,
                             unsigned int channel_idx,
-                            unsigned char *data,
+                            const unsigned char *data,
                             unsigned int length,
                             void (*packet_sent_callback) (void *cb,
                                                           unsigned int length),
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index cc7dcea2d283..5eca7a99afe6 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -49,7 +49,7 @@ static void ipwireless_detach(struct pcmcia_device *link);
 /* Debug mode: more verbose, print sent/recv bytes */
 int ipwireless_debug;
 int ipwireless_loopback;
-int ipwireless_out_queue = 1;
+int ipwireless_out_queue = 10;
 
 module_param_named(debug, ipwireless_debug, int, 0);
 module_param_named(loopback, ipwireless_loopback, int, 0);
@@ -57,7 +57,7 @@ module_param_named(out_queue, ipwireless_out_queue, int, 0);
 MODULE_PARM_DESC(debug, "switch on debug messages [0]");
 MODULE_PARM_DESC(loopback,
                 "debug: enable ras_raw channel [0]");
-MODULE_PARM_DESC(out_queue, "debug: set size of outgoing queue [1]");
+MODULE_PARM_DESC(out_queue, "debug: set size of outgoing PPP queue [10]");
 
 /* Executes in process context. */
 static void signalled_reboot_work(struct work_struct *work_reboot)
@@ -88,8 +88,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
         unsigned short buf[64];
         cisparse_t parse;
         unsigned short cor_value;
-        win_req_t request_attr_memory;
-        win_req_t request_common_memory;
         memreq_t memreq_attr_memory;
         memreq_t memreq_common_memory;
 
@@ -188,6 +186,9 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 goto exit0;
         }
 
+        request_region(link->io.BasePort1, link->io.NumPorts1,
+                        IPWIRELESS_PCCARD_NAME);
+
         /* memory settings */
 
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
@@ -214,16 +215,16 @@ static int config_ipwireless(struct ipw_dev *ipw)
         }
 
         if (parse.cftable_entry.mem.nwin > 0) {
-                request_common_memory.Attributes =
+                ipw->request_common_memory.Attributes =
                         WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
-                request_common_memory.Base =
+                ipw->request_common_memory.Base =
                         parse.cftable_entry.mem.win[0].host_addr;
-                request_common_memory.Size = parse.cftable_entry.mem.win[0].len;
-                if (request_common_memory.Size < 0x1000)
-                        request_common_memory.Size = 0x1000;
-                request_common_memory.AccessSpeed = 0;
+                ipw->request_common_memory.Size = parse.cftable_entry.mem.win[0].len;
+                if (ipw->request_common_memory.Size < 0x1000)
+                        ipw->request_common_memory.Size = 0x1000;
+                ipw->request_common_memory.AccessSpeed = 0;
 
-                ret = pcmcia_request_window(&link, &request_common_memory,
+                ret = pcmcia_request_window(&link, &ipw->request_common_memory,
                                 &ipw->handle_common_memory);
 
                 if (ret != CS_SUCCESS) {
@@ -246,16 +247,18 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ipw->is_v2_card =
                         parse.cftable_entry.mem.win[0].len == 0x100;
 
-                ipw->common_memory = ioremap(request_common_memory.Base,
-                                request_common_memory.Size);
+                ipw->common_memory = ioremap(ipw->request_common_memory.Base,
+                                ipw->request_common_memory.Size);
+                request_mem_region(ipw->request_common_memory.Base,
+                                ipw->request_common_memory.Size, IPWIRELESS_PCCARD_NAME);
 
-                request_attr_memory.Attributes =
+                ipw->request_attr_memory.Attributes =
                         WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE;
-                request_attr_memory.Base = 0;
-                request_attr_memory.Size = 0;   /* this used to be 0x1000 */
-                request_attr_memory.AccessSpeed = 0;
+                ipw->request_attr_memory.Base = 0;
+                ipw->request_attr_memory.Size = 0;      /* this used to be 0x1000 */
+                ipw->request_attr_memory.AccessSpeed = 0;
 
-                ret = pcmcia_request_window(&link, &request_attr_memory,
+                ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
                                 &ipw->handle_attr_memory);
 
                 if (ret != CS_SUCCESS) {
@@ -274,8 +277,10 @@ static int config_ipwireless(struct ipw_dev *ipw)
                         goto exit2;
                 }
 
-                ipw->attr_memory = ioremap(request_attr_memory.Base,
-                                request_attr_memory.Size);
+                ipw->attr_memory = ioremap(ipw->request_attr_memory.Base,
+                                ipw->request_attr_memory.Size);
+                request_mem_region(ipw->request_attr_memory.Base, ipw->request_attr_memory.Size,
+                                IPWIRELESS_PCCARD_NAME);
         }
 
         INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
@@ -311,14 +316,13 @@ static int config_ipwireless(struct ipw_dev *ipw)
                         (unsigned int) link->irq.AssignedIRQ);
         if (ipw->attr_memory && ipw->common_memory)
                 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                                ": attr memory 0x%08lx-0x%08lx, "
-                                "common memory 0x%08lx-0x%08lx\n",
-                                request_attr_memory.Base,
-                                request_attr_memory.Base
-                                + request_attr_memory.Size - 1,
-                                request_common_memory.Base,
-                                request_common_memory.Base
-                                + request_common_memory.Size - 1);
+                        ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n",
+                        ipw->request_attr_memory.Base,
+                        ipw->request_attr_memory.Base
+                        + ipw->request_attr_memory.Size - 1,
+                        ipw->request_common_memory.Base,
+                        ipw->request_common_memory.Base
+                        + ipw->request_common_memory.Size - 1);
 
         ipw->network = ipwireless_network_create(ipw->hardware);
         if (!ipw->network)
@@ -350,12 +354,16 @@ exit4:
         pcmcia_disable_device(link);
 exit3:
         if (ipw->attr_memory) {
+                release_mem_region(ipw->request_attr_memory.Base,
+                                ipw->request_attr_memory.Size);
                 iounmap(ipw->attr_memory);
                 pcmcia_release_window(ipw->handle_attr_memory);
                 pcmcia_disable_device(link);
         }
 exit2:
         if (ipw->common_memory) {
+                release_mem_region(ipw->request_common_memory.Base,
+                                ipw->request_common_memory.Size);
                 iounmap(ipw->common_memory);
                 pcmcia_release_window(ipw->handle_common_memory);
         }
@@ -367,19 +375,25 @@ exit0:
 
 static void release_ipwireless(struct ipw_dev *ipw)
 {
-        struct pcmcia_device *link = ipw->link;
-
-        pcmcia_disable_device(link);
+        pcmcia_disable_device(ipw->link);
 
-        if (ipw->common_memory)
+        if (ipw->common_memory) {
+                release_mem_region(ipw->request_common_memory.Base,
+                                ipw->request_common_memory.Size);
                 iounmap(ipw->common_memory);
-        if (ipw->attr_memory)
+        }
+        if (ipw->attr_memory) {
+                release_mem_region(ipw->request_attr_memory.Base,
+                                ipw->request_attr_memory.Size);
                 iounmap(ipw->attr_memory);
+        }
         if (ipw->common_memory)
                 pcmcia_release_window(ipw->handle_common_memory);
         if (ipw->attr_memory)
                 pcmcia_release_window(ipw->handle_attr_memory);
-        pcmcia_disable_device(link);
+
+        /* Break the link with Card Services */
+        pcmcia_disable_device(ipw->link);
 }
 
 /*
@@ -437,10 +451,6 @@ static void ipwireless_detach(struct pcmcia_device *link)
 
         release_ipwireless(ipw);
 
-        /* Break the link with Card Services */
-        if (link)
-                pcmcia_disable_device(link);
-
         if (ipw->tty != NULL)
                 ipwireless_tty_free(ipw->tty);
         if (ipw->network != NULL)
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h
index 1bfdcc8d47d6..0e0363af9ab2 100644
--- a/drivers/char/pcmcia/ipwireless/main.h
+++ b/drivers/char/pcmcia/ipwireless/main.h
@@ -45,10 +45,15 @@ struct ipw_tty;
 struct ipw_dev {
         struct pcmcia_device *link;
         int is_v2_card;
+
         window_handle_t handle_attr_memory;
         void __iomem *attr_memory;
+        win_req_t request_attr_memory;
+
         window_handle_t handle_common_memory;
         void __iomem *common_memory;
+        win_req_t request_common_memory;
+
         dev_node_t nodes[2];
         /* Reference to attribute memory, containing CIS data */
         void *attribute_memory;
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/char/pcmcia/ipwireless/network.c
index fe914d34f7f6..590762a7f217 100644
--- a/drivers/char/pcmcia/ipwireless/network.c
+++ b/drivers/char/pcmcia/ipwireless/network.c
@@ -29,7 +29,6 @@
 #include "main.h"
 #include "tty.h"
 
-#define MAX_OUTGOING_PACKETS_QUEUED   ipwireless_out_queue
 #define MAX_ASSOCIATED_TTYS 2
 
 #define SC_RCV_BITS     (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP)
@@ -46,7 +45,7 @@ struct ipw_network {
         /* Number of packets queued up in hardware module. */
         int outgoing_packets_queued;
         /* Spinlock to avoid interrupts during shutdown */
-        spinlock_t spinlock;
+        spinlock_t lock;
         struct mutex close_lock;
 
         /* PPP ioctl data, not actually used anywere */
@@ -68,20 +67,20 @@ static void notify_packet_sent(void *callback_data, unsigned int packet_length)
         struct ipw_network *network = callback_data;
         unsigned long flags;
 
-        spin_lock_irqsave(&network->spinlock, flags);
+        spin_lock_irqsave(&network->lock, flags);
         network->outgoing_packets_queued--;
         if (network->ppp_channel != NULL) {
                 if (network->ppp_blocked) {
                         network->ppp_blocked = 0;
-                        spin_unlock_irqrestore(&network->spinlock, flags);
+                        spin_unlock_irqrestore(&network->lock, flags);
                         ppp_output_wakeup(network->ppp_channel);
                         if (ipwireless_debug)
-                                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
+                                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
                                        ": ppp unblocked\n");
                 } else
-                        spin_unlock_irqrestore(&network->spinlock, flags);
+                        spin_unlock_irqrestore(&network->lock, flags);
         } else
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
 }
 
 /*
@@ -93,8 +92,8 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
         struct ipw_network *network = ppp_channel->private;
         unsigned long flags;
 
-        spin_lock_irqsave(&network->spinlock, flags);
-        if (network->outgoing_packets_queued < MAX_OUTGOING_PACKETS_QUEUED) {
+        spin_lock_irqsave(&network->lock, flags);
+        if (network->outgoing_packets_queued < ipwireless_out_queue) {
                 unsigned char *buf;
                 static unsigned char header[] = {
                         PPP_ALLSTATIONS, /* 0xff */
@@ -103,7 +102,7 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
                 int ret;
 
                 network->outgoing_packets_queued++;
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
 
                 /*
                  * If we have the requested amount of headroom in the skb we
@@ -144,7 +143,9 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
                  * needs to be unblocked once we are ready to send.
                  */
                 network->ppp_blocked = 1;
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
+                if (ipwireless_debug)
+                        printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": ppp blocked\n");
                 return 0;
         }
 }
@@ -249,11 +250,11 @@ static void do_go_online(struct work_struct *work_go_online)
                                 work_go_online);
         unsigned long flags;
 
-        spin_lock_irqsave(&network->spinlock, flags);
+        spin_lock_irqsave(&network->lock, flags);
         if (!network->ppp_channel) {
                 struct ppp_channel *channel;
 
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
                 channel = kzalloc(sizeof(struct ppp_channel), GFP_KERNEL);
                 if (!channel) {
                         printk(KERN_ERR IPWIRELESS_PCCARD_NAME
@@ -273,10 +274,10 @@ static void do_go_online(struct work_struct *work_go_online)
                 network->xaccm[3] = 0x60000000U;
                 network->raccm = ~0U;
                 ppp_register_channel(channel);
-                spin_lock_irqsave(&network->spinlock, flags);
+                spin_lock_irqsave(&network->lock, flags);
                 network->ppp_channel = channel;
         }
-        spin_unlock_irqrestore(&network->spinlock, flags);
+        spin_unlock_irqrestore(&network->lock, flags);
 }
 
 static void do_go_offline(struct work_struct *work_go_offline)
@@ -287,16 +288,16 @@ static void do_go_offline(struct work_struct *work_go_offline)
         unsigned long flags;
 
         mutex_lock(&network->close_lock);
-        spin_lock_irqsave(&network->spinlock, flags);
+        spin_lock_irqsave(&network->lock, flags);
         if (network->ppp_channel != NULL) {
                 struct ppp_channel *channel = network->ppp_channel;
 
                 network->ppp_channel = NULL;
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
                 mutex_unlock(&network->close_lock);
                 ppp_unregister_channel(channel);
         } else {
-                spin_unlock_irqrestore(&network->spinlock, flags);
+                spin_unlock_irqrestore(&network->lock, flags);
                 mutex_unlock(&network->close_lock);
         }
 }
@@ -381,18 +382,18 @@ void ipwireless_network_packet_received(struct ipw_network *network,
                          * the PPP layer.
                          */
                         mutex_lock(&network->close_lock);
-                        spin_lock_irqsave(&network->spinlock, flags);
+                        spin_lock_irqsave(&network->lock, flags);
                         if (network->ppp_channel != NULL) {
                                 struct sk_buff *skb;
 
-                                spin_unlock_irqrestore(&network->spinlock,
+                                spin_unlock_irqrestore(&network->lock,
                                                 flags);
 
                                 /* Send the data to the ppp_generic module. */
                                 skb = ipw_packet_received_skb(data, length);
                                 ppp_input(network->ppp_channel, skb);
                         } else
-                                spin_unlock_irqrestore(&network->spinlock,
+                                spin_unlock_irqrestore(&network->lock,
                                                 flags);
                         mutex_unlock(&network->close_lock);
                 }
@@ -410,7 +411,7 @@ struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw)
         if (!network)
                 return NULL;
 
-        spin_lock_init(&network->spinlock);
+        spin_lock_init(&network->lock);
         mutex_init(&network->close_lock);
 
         network->hardware = hw;
@@ -478,10 +479,10 @@ int ipwireless_ppp_channel_index(struct ipw_network *network)
         int ret = -1;
         unsigned long flags;
 
-        spin_lock_irqsave(&network->spinlock, flags);
+        spin_lock_irqsave(&network->lock, flags);
         if (network->ppp_channel != NULL)
                 ret = ppp_channel_index(network->ppp_channel);
-        spin_unlock_irqrestore(&network->spinlock, flags);
+        spin_unlock_irqrestore(&network->lock, flags);
 
         return ret;
 }
@@ -491,10 +492,15 @@ int ipwireless_ppp_unit_number(struct ipw_network *network)
         int ret = -1;
         unsigned long flags;
 
-        spin_lock_irqsave(&network->spinlock, flags);
+        spin_lock_irqsave(&network->lock, flags);
         if (network->ppp_channel != NULL)
                 ret = ppp_unit_number(network->ppp_channel);
-        spin_unlock_irqrestore(&network->spinlock, flags);
+        spin_unlock_irqrestore(&network->lock, flags);
 
         return ret;
 }
+
+int ipwireless_ppp_mru(const struct ipw_network *network)
+{
+        return network->mru;
+}
diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/char/pcmcia/ipwireless/network.h
index ccacd26fc7ef..561f765b3334 100644
--- a/drivers/char/pcmcia/ipwireless/network.h
+++ b/drivers/char/pcmcia/ipwireless/network.h
@@ -48,5 +48,6 @@ void ipwireless_ppp_open(struct ipw_network *net);
 void ipwireless_ppp_close(struct ipw_network *net);
 int ipwireless_ppp_channel_index(struct ipw_network *net);
 int ipwireless_ppp_unit_number(struct ipw_network *net);
+int ipwireless_ppp_mru(const struct ipw_network *net);
 
 #endif
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index 42f3815c5ce3..b1414507997c 100644
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -259,7 +259,7 @@ static int ipw_write(struct tty_struct *linux_tty,
         }
 
         ret = ipwireless_send_packet(tty->hardware, IPW_CHANNEL_RAS,
-                               (unsigned char *) buf, count,
+                               buf, count,
                                ipw_write_packet_sent_callback, tty);
         if (ret == -1) {
                 mutex_unlock(&tty->ipw_tty_mutex);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 5405769020a1..5ce07b517c58 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -94,7 +94,7 @@ void cpuidle_install_idle_handler(void)
  */
 void cpuidle_uninstall_idle_handler(void)
 {
-        if (enabled_devices && (pm_idle != pm_idle_old)) {
+        if (enabled_devices && pm_idle_old && (pm_idle != pm_idle_old)) {
                 pm_idle = pm_idle_old;
                 cpuidle_kick_cpus();
         }
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index b11943dadefd..681c15f42083 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -99,6 +99,9 @@ struct talitos_private {
         /* next channel to be assigned next incoming descriptor */
         atomic_t last_chan;
 
+        /* per-channel number of requests pending in channel h/w fifo */
+        atomic_t *submit_count;
+
         /* per-channel request fifo */
         struct talitos_request **fifo;
 
@@ -263,15 +266,15 @@ static int talitos_submit(struct device *dev, struct talitos_desc *desc,
 
         spin_lock_irqsave(&priv->head_lock[ch], flags);
 
-        head = priv->head[ch];
-        request = &priv->fifo[ch][head];
-
-        if (request->desc) {
-                /* request queue is full */
+        if (!atomic_inc_not_zero(&priv->submit_count[ch])) {
+                /* h/w fifo is full */
                 spin_unlock_irqrestore(&priv->head_lock[ch], flags);
                 return -EAGAIN;
         }
 
+        head = priv->head[ch];
+        request = &priv->fifo[ch][head];
+
         /* map descriptor and save caller data */
         request->dma_desc = dma_map_single(dev, desc, sizeof(*desc),
                                            DMA_BIDIRECTIONAL);
@@ -335,6 +338,9 @@ static void flush_channel(struct device *dev, int ch, int error, int reset_ch)
                 priv->tail[ch] = (tail + 1) & (priv->fifo_len - 1);
 
                 spin_unlock_irqrestore(&priv->tail_lock[ch], flags);
+
+                atomic_dec(&priv->submit_count[ch]);
+
                 saved_req.callback(dev, saved_req.desc, saved_req.context,
                                    status);
                 /* channel may resume processing in single desc error case */
@@ -842,7 +848,7 @@ static int sg_to_link_tbl(struct scatterlist *sg, int sg_count,
 
         /* adjust (decrease) last one (or two) entry's len to cryptlen */
         link_tbl_ptr--;
-        while (link_tbl_ptr->len <= (-cryptlen)) {
+        while (be16_to_cpu(link_tbl_ptr->len) <= (-cryptlen)) {
                 /* Empty this entry, and move to previous one */
                 cryptlen += be16_to_cpu(link_tbl_ptr->len);
                 link_tbl_ptr->len = 0;
@@ -874,7 +880,7 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,
         unsigned int cryptlen = areq->cryptlen;
         unsigned int authsize = ctx->authsize;
         unsigned int ivsize;
-        int sg_count;
+        int sg_count, ret;
 
         /* hmac key */
         map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key,
@@ -978,7 +984,12 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,
         map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, 0,
                                DMA_FROM_DEVICE);
 
-        return talitos_submit(dev, desc, callback, areq);
+        ret = talitos_submit(dev, desc, callback, areq);
+        if (ret != -EINPROGRESS) {
+                ipsec_esp_unmap(dev, edesc, areq);
+                kfree(edesc);
+        }
+        return ret;
 }
 
 
@@ -1009,6 +1020,8 @@ static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq,
         struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
         struct ipsec_esp_edesc *edesc;
         int src_nents, dst_nents, alloc_len, dma_len;
+        gfp_t flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
+                      GFP_ATOMIC;
 
         if (areq->cryptlen + ctx->authsize > TALITOS_MAX_DATA_LEN) {
                 dev_err(ctx->dev, "cryptlen exceeds h/w max limit\n");
@@ -1022,7 +1035,7 @@ static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq,
                 dst_nents = src_nents;
         } else {
                 dst_nents = sg_count(areq->dst, areq->cryptlen + ctx->authsize);
-                dst_nents = (dst_nents == 1) ? 0 : src_nents;
+                dst_nents = (dst_nents == 1) ? 0 : dst_nents;
         }
 
         /*
@@ -1040,7 +1053,7 @@ static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq,
                 alloc_len += icv_stashing ? ctx->authsize : 0;
         }
 
-        edesc = kmalloc(alloc_len, GFP_DMA);
+        edesc = kmalloc(alloc_len, GFP_DMA | flags);
         if (!edesc) {
                 dev_err(ctx->dev, "could not allocate edescriptor\n");
                 return ERR_PTR(-ENOMEM);
@@ -1337,6 +1350,7 @@ static int __devexit talitos_remove(struct of_device *ofdev)
         if (hw_supports(dev, DESC_HDR_SEL0_RNG))
                 talitos_unregister_rng(dev);
 
+        kfree(priv->submit_count);
         kfree(priv->tail);
         kfree(priv->head);
 
@@ -1466,9 +1480,6 @@ static int talitos_probe(struct of_device *ofdev,
                 goto err_out;
         }
 
-        of_node_put(np);
-        np = NULL;
-
         priv->head_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels,
                                   GFP_KERNEL);
         priv->tail_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels,
@@ -1504,6 +1515,16 @@ static int talitos_probe(struct of_device *ofdev,
                 }
         }
 
+        priv->submit_count = kmalloc(sizeof(atomic_t) * priv->num_channels,
+                                     GFP_KERNEL);
+        if (!priv->submit_count) {
+                dev_err(dev, "failed to allocate fifo submit count space\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+        for (i = 0; i < priv->num_channels; i++)
+                atomic_set(&priv->submit_count[i], -priv->chfifo_len);
+
         priv->head = kzalloc(sizeof(int) * priv->num_channels, GFP_KERNEL);
         priv->tail = kzalloc(sizeof(int) * priv->num_channels, GFP_KERNEL);
         if (!priv->head || !priv->tail) {
@@ -1559,8 +1580,6 @@ static int talitos_probe(struct of_device *ofdev,
 
 err_out:
         talitos_remove(ofdev);
-        if (np)
-                of_node_put(np);
 
         return err;
 }
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 76f26710fc16..fa6d6abefd4d 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -16,8 +16,13 @@ config FIREWIRE
           enable the new stack.
 
           To compile this driver as a module, say M here: the module will be
-          called firewire-core.  It functionally replaces ieee1394, raw1394,
-          and video1394.
+          called firewire-core.
+
+          This module functionally replaces ieee1394, raw1394, and video1394.
+          To access it from application programs, you generally need at least
+          libraw1394 version 2.  IIDC/DCAM applications also need libdc1394
+          version 2.  No libraries are required to access storage devices
+          through the firewire-sbp2 driver.
 
 config FIREWIRE_OHCI
         tristate "OHCI-1394 controllers"
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index da873d795aad..bbd73a406e53 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -539,7 +539,7 @@ fw_core_remove_card(struct fw_card *card)
         wait_for_completion(&card->done);
 
         cancel_delayed_work_sync(&card->work);
-        fw_flush_transactions(card);
+        WARN_ON(!list_empty(&card->transaction_list));
         del_timer_sync(&card->flush_timer);
 }
 EXPORT_SYMBOL(fw_core_remove_card);
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index c639915fc3cb..bc81d6fcd2fd 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -382,9 +382,9 @@ complete_transaction(struct fw_card *card, int rcode,
 
         response->response.type   = FW_CDEV_EVENT_RESPONSE;
         response->response.rcode  = rcode;
-        queue_event(client, &response->event,
-                    &response->response, sizeof(response->response),
-                    response->response.data, response->response.length);
+        queue_event(client, &response->event, &response->response,
+                    sizeof(response->response) + response->response.length,
+                    NULL, 0);
 }
 
 static int ioctl_send_request(struct client *client, void *buffer)
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 566672e0bcff..251416f2148f 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -171,7 +171,6 @@ struct iso_context {
 struct fw_ohci {
         struct fw_card card;
 
-        u32 version;
         __iomem char *registers;
         dma_addr_t self_id_bus;
         __le32 *self_id_cpu;
@@ -180,6 +179,8 @@ struct fw_ohci {
         int generation;
         int request_generation; /* for timestamping incoming requests */
         u32 bus_seconds;
+
+        bool use_dualbuffer;
         bool old_uninorth;
         bool bus_reset_packet_quirk;
 
@@ -1885,7 +1886,7 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
         } else {
                 mask = &ohci->ir_context_mask;
                 list = ohci->ir_context_list;
-                if (ohci->version >= OHCI_VERSION_1_1)
+                if (ohci->use_dualbuffer)
                         callback = handle_ir_dualbuffer_packet;
                 else
                         callback = handle_ir_packet_per_buffer;
@@ -1949,7 +1950,7 @@ static int ohci_start_iso(struct fw_iso_context *base,
         } else {
                 index = ctx - ohci->ir_context_list;
                 control = IR_CONTEXT_ISOCH_HEADER;
-                if (ohci->version >= OHCI_VERSION_1_1)
+                if (ohci->use_dualbuffer)
                         control |= IR_CONTEXT_DUAL_BUFFER_MODE;
                 match = (tags << 28) | (sync << 8) | ctx->base.channel;
                 if (cycle >= 0) {
@@ -2279,7 +2280,7 @@ ohci_queue_iso(struct fw_iso_context *base,
         spin_lock_irqsave(&ctx->context.ohci->lock, flags);
         if (base->type == FW_ISO_CONTEXT_TRANSMIT)
                 retval = ohci_queue_iso_transmit(base, packet, buffer, payload);
-        else if (ctx->context.ohci->version >= OHCI_VERSION_1_1)
+        else if (ctx->context.ohci->use_dualbuffer)
                 retval = ohci_queue_iso_receive_dualbuffer(base, packet,
                                                          buffer, payload);
         else
@@ -2341,7 +2342,7 @@ static int __devinit
 pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 {
         struct fw_ohci *ohci;
-        u32 bus_options, max_receive, link_speed;
+        u32 bus_options, max_receive, link_speed, version;
         u64 guid;
         int err;
         size_t size;
@@ -2366,12 +2367,6 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0);
         pci_set_drvdata(dev, ohci);
 
-#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
-        ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE &&
-                             dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW;
-#endif
-        ohci->bus_reset_packet_quirk = dev->vendor == PCI_VENDOR_ID_TI;
-
         spin_lock_init(&ohci->lock);
 
         tasklet_init(&ohci->bus_reset_tasklet,
@@ -2390,6 +2385,23 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                 goto fail_iomem;
         }
 
+        version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
+        ohci->use_dualbuffer = version >= OHCI_VERSION_1_1;
+
+/* x86-32 currently doesn't use highmem for dma_alloc_coherent */
+#if !defined(CONFIG_X86_32)
+        /* dual-buffer mode is broken with descriptor addresses above 2G */
+        if (dev->vendor == PCI_VENDOR_ID_TI &&
+            dev->device == PCI_DEVICE_ID_TI_TSB43AB22)
+                ohci->use_dualbuffer = false;
+#endif
+
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+        ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE &&
+                             dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW;
+#endif
+        ohci->bus_reset_packet_quirk = dev->vendor == PCI_VENDOR_ID_TI;
+
         ar_context_init(&ohci->ar_request_ctx, ohci,
                         OHCI1394_AsReqRcvContextControlSet);
 
@@ -2441,9 +2453,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         if (err < 0)
                 goto fail_self_id;
 
-        ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
         fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
-                  dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff);
+                  dev->dev.bus_id, version >> 16, version & 0xff);
         return 0;
 
  fail_self_id:
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index 213b0ff8f3d6..c1b81077c4a8 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -510,8 +510,6 @@ fw_core_handle_bus_reset(struct fw_card *card,
         struct fw_node *local_node;
         unsigned long flags;
 
-        fw_flush_transactions(card);
-
         spin_lock_irqsave(&card->lock, flags);
 
         /*
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 40db80752272..e5d1a0b64fcf 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
@@ -151,7 +152,7 @@ transmit_complete_callback(struct fw_packet *packet,
 
 static void
 fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
-                int node_id, int source_id, int generation, int speed,
+                int destination_id, int source_id, int generation, int speed,
                 unsigned long long offset, void *payload, size_t length)
 {
         int ext_tcode;
@@ -166,7 +167,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
                 HEADER_RETRY(RETRY_X) |
                 HEADER_TLABEL(tlabel) |
                 HEADER_TCODE(tcode) |
-                HEADER_DESTINATION(node_id);
+                HEADER_DESTINATION(destination_id);
         packet->header[1] =
                 HEADER_OFFSET_HIGH(offset >> 32) | HEADER_SOURCE(source_id);
         packet->header[2] =
@@ -252,7 +253,7 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
                 fw_transaction_callback_t callback, void *callback_data)
 {
         unsigned long flags;
-        int tlabel, source;
+        int tlabel;
 
         /*
          * Bump the flush timer up 100ms first of all so we
@@ -268,7 +269,6 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
 
         spin_lock_irqsave(&card->lock, flags);
 
-        source = card->node_id;
         tlabel = card->current_tlabel;
         if (card->tlabel_mask & (1 << tlabel)) {
                 spin_unlock_irqrestore(&card->lock, flags);
@@ -279,77 +279,58 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
         card->current_tlabel = (card->current_tlabel + 1) & 0x1f;
         card->tlabel_mask |= (1 << tlabel);
 
-        list_add_tail(&t->link, &card->transaction_list);
-
-        spin_unlock_irqrestore(&card->lock, flags);
-
-        /* Initialize rest of transaction, fill out packet and send it. */
         t->node_id = node_id;
         t->tlabel = tlabel;
         t->callback = callback;
         t->callback_data = callback_data;
 
-        fw_fill_request(&t->packet, tcode, t->tlabel,
-                        node_id, source, generation,
-                        speed, offset, payload, length);
+        fw_fill_request(&t->packet, tcode, t->tlabel, node_id, card->node_id,
+                        generation, speed, offset, payload, length);
         t->packet.callback = transmit_complete_callback;
 
+        list_add_tail(&t->link, &card->transaction_list);
+
+        spin_unlock_irqrestore(&card->lock, flags);
+
         card->driver->send_request(card, &t->packet);
 }
 EXPORT_SYMBOL(fw_send_request);
 
-struct fw_phy_packet {
-        struct fw_packet packet;
-        struct completion done;
-        struct kref kref;
-};
-
-static void phy_packet_release(struct kref *kref)
-{
-        struct fw_phy_packet *p =
-                        container_of(kref, struct fw_phy_packet, kref);
-        kfree(p);
-}
+static DEFINE_MUTEX(phy_config_mutex);
+static DECLARE_COMPLETION(phy_config_done);
 
 static void transmit_phy_packet_callback(struct fw_packet *packet,
                                          struct fw_card *card, int status)
 {
-        struct fw_phy_packet *p =
-                        container_of(packet, struct fw_phy_packet, packet);
-
-        complete(&p->done);
-        kref_put(&p->kref, phy_packet_release);
+        complete(&phy_config_done);
 }
 
+static struct fw_packet phy_config_packet = {
+        .header_length  = 8,
+        .payload_length = 0,
+        .speed          = SCODE_100,
+        .callback       = transmit_phy_packet_callback,
+};
+
 void fw_send_phy_config(struct fw_card *card,
                         int node_id, int generation, int gap_count)
 {
-        struct fw_phy_packet *p;
         long timeout = DIV_ROUND_UP(HZ, 10);
         u32 data = PHY_IDENTIFIER(PHY_PACKET_CONFIG) |
                    PHY_CONFIG_ROOT_ID(node_id) |
                    PHY_CONFIG_GAP_COUNT(gap_count);
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
-        if (p == NULL)
-                return;
+        mutex_lock(&phy_config_mutex);
+
+        phy_config_packet.header[0] = data;
+        phy_config_packet.header[1] = ~data;
+        phy_config_packet.generation = generation;
+        INIT_COMPLETION(phy_config_done);
+
+        card->driver->send_request(card, &phy_config_packet);
+        wait_for_completion_timeout(&phy_config_done, timeout);
 
-        p->packet.header[0] = data;
-        p->packet.header[1] = ~data;
-        p->packet.header_length = 8;
-        p->packet.payload_length = 0;
-        p->packet.speed = SCODE_100;
-        p->packet.generation = generation;
-        p->packet.callback = transmit_phy_packet_callback;
-        init_completion(&p->done);
-        kref_set(&p->kref, 2);
-
-        card->driver->send_request(card, &p->packet);
-        timeout = wait_for_completion_timeout(&p->done, timeout);
-        kref_put(&p->kref, phy_packet_release);
-
-        /* will leak p if the callback is never executed */
-        WARN_ON(timeout == 0);
+        mutex_unlock(&phy_config_mutex);
 }
 
 void fw_flush_transactions(struct fw_card *card)
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index c66817e7717b..50a071f1c945 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -245,7 +245,6 @@ static ssize_t host_control_on_shutdown_store(struct device *dev,
 static int smi_request(struct smi_cmd *smi_cmd)
 {
         cpumask_t old_mask;
-        cpumask_of_cpu_ptr(new_mask, 0);
         int ret = 0;
 
         if (smi_cmd->magic != SMI_CMD_MAGIC) {
@@ -256,7 +255,7 @@ static int smi_request(struct smi_cmd *smi_cmd)
 
         /* SMI requires CPU 0 */
         old_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, new_mask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(0));
         if (smp_processor_id() != 0) {
                 dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
                         __func__);
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 48d084bdf7c8..3c855ff2992f 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -49,6 +49,8 @@ struct bfin_twi_iface {
         struct i2c_msg          *pmsg;
         int                     msg_num;
         int                     cur_msg;
+        u16                     saved_clkdiv;
+        u16                     saved_control;
         void __iomem            *regs_base;
 };
 
@@ -565,32 +567,43 @@ static u32 bfin_twi_functionality(struct i2c_adapter *adap)
                I2C_FUNC_I2C;
 }
 
-
 static struct i2c_algorithm bfin_twi_algorithm = {
         .master_xfer   = bfin_twi_master_xfer,
         .smbus_xfer    = bfin_twi_smbus_xfer,
         .functionality = bfin_twi_functionality,
 };
 
-
-static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state)
+static int i2c_bfin_twi_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct bfin_twi_iface *iface = platform_get_drvdata(dev);
+        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
+
+        iface->saved_clkdiv = read_CLKDIV(iface);
+        iface->saved_control = read_CONTROL(iface);
+
+        free_irq(iface->irq, iface);
 
         /* Disable TWI */
-        write_CONTROL(iface, read_CONTROL(iface) & ~TWI_ENA);
-        SSYNC();
+        write_CONTROL(iface, iface->saved_control & ~TWI_ENA);
 
         return 0;
 }
 
-static int i2c_bfin_twi_resume(struct platform_device *dev)
+static int i2c_bfin_twi_resume(struct platform_device *pdev)
 {
-        struct bfin_twi_iface *iface = platform_get_drvdata(dev);
+        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
 
-        /* Enable TWI */
-        write_CONTROL(iface, read_CONTROL(iface) | TWI_ENA);
-        SSYNC();
+        int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+                IRQF_DISABLED, pdev->name, iface);
+        if (rc) {
+                dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
+                return -ENODEV;
+        }
+
+        /* Resume TWI interface clock as specified */
+        write_CLKDIV(iface, iface->saved_clkdiv);
+
+        /* Resume TWI */
+        write_CONTROL(iface, iface->saved_control);
 
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 79b455a1f090..32104eac8d3d 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -77,7 +77,7 @@ static int i2c_gpio_getscl(void *data)
         return gpio_get_value(pdata->scl_pin);
 }
 
-static int __init i2c_gpio_probe(struct platform_device *pdev)
+static int __devinit i2c_gpio_probe(struct platform_device *pdev)
 {
         struct i2c_gpio_platform_data *pdata;
         struct i2c_algo_bit_data *bit_data;
@@ -174,7 +174,7 @@ err_alloc_adap:
         return ret;
 }
 
-static int __exit i2c_gpio_remove(struct platform_device *pdev)
+static int __devexit i2c_gpio_remove(struct platform_device *pdev)
 {
         struct i2c_gpio_platform_data *pdata;
         struct i2c_adapter *adap;
@@ -196,14 +196,15 @@ static struct platform_driver i2c_gpio_driver = {
                 .name   = "i2c-gpio",
                 .owner  = THIS_MODULE,
         },
-        .remove         = __exit_p(i2c_gpio_remove),
+        .probe          = i2c_gpio_probe,
+        .remove         = __devexit_p(i2c_gpio_remove),
 };
 
 static int __init i2c_gpio_init(void)
 {
         int ret;
 
-        ret = platform_driver_probe(&i2c_gpio_driver, i2c_gpio_probe);
+        ret = platform_driver_register(&i2c_gpio_driver);
         if (ret)
                 printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret);
 
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 007390ad9810..4864723c7425 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -33,6 +33,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
@@ -64,6 +65,7 @@ struct s3c24xx_i2c {
         unsigned int            tx_setup;
 
         enum s3c24xx_i2c_state  state;
+        unsigned long           clkrate;
 
         void __iomem            *regs;
         struct clk              *clk;
@@ -71,6 +73,10 @@ struct s3c24xx_i2c {
         struct resource         *irq;
         struct resource         *ioarea;
         struct i2c_adapter      adap;
+
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
 };
 
 /* default platform data to use if not supplied in the platform_device
@@ -501,6 +507,9 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
         unsigned long timeout;
         int ret;
 
+        if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+                return -EIO;
+
         ret = s3c24xx_i2c_set_master(i2c);
         if (ret != 0) {
                 dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
@@ -636,27 +645,28 @@ static inline int freq_acceptable(unsigned int freq, unsigned int wanted)
         return (diff >= -2 && diff <= 2);
 }
 
-/* s3c24xx_i2c_getdivisor
+/* s3c24xx_i2c_clockrate
  *
  * work out a divisor for the user requested frequency setting,
  * either by the requested frequency, or scanning the acceptable
  * range of frequencies until something is found
 */
 
-static int s3c24xx_i2c_getdivisor(struct s3c24xx_i2c *i2c,
-                                  struct s3c2410_platform_i2c *pdata,
-                                  unsigned long *iicon,
-                                  unsigned int *got)
+static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got)
 {
+        struct s3c2410_platform_i2c *pdata;
         unsigned long clkin = clk_get_rate(i2c->clk);
-        
         unsigned int divs, div1;
+        u32 iiccon;
         int freq;
         int start, end;
 
+        i2c->clkrate = clkin;
+
+        pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent);
         clkin /= 1000;          /* clkin now in KHz */
      
-        dev_dbg(i2c->dev,  "pdata %p, freq %lu %lu..%lu\n",
+        dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n",
                  pdata, pdata->bus_freq, pdata->min_freq, pdata->max_freq);
 
         if (pdata->bus_freq != 0) {
@@ -688,11 +698,79 @@ static int s3c24xx_i2c_getdivisor(struct s3c24xx_i2c *i2c,
 
  found:
         *got = freq;
-        *iicon |= (divs-1);
-        *iicon |= (div1 == 512) ? S3C2410_IICCON_TXDIV_512 : 0;
+
+        iiccon = readl(i2c->regs + S3C2410_IICCON);
+        iiccon &= ~(S3C2410_IICCON_SCALEMASK | S3C2410_IICCON_TXDIV_512);
+        iiccon |= (divs-1);
+
+        if (div1 == 512)
+                iiccon |= S3C2410_IICCON_TXDIV_512;
+
+        writel(iiccon, i2c->regs + S3C2410_IICCON);
+
+        return 0;
+}
+
+#ifdef CONFIG_CPU_FREQ
+
+#define freq_to_i2c(_n) container_of(_n, struct s3c24xx_i2c, freq_transition)
+
+static int s3c24xx_i2c_cpufreq_transition(struct notifier_block *nb,
+                                          unsigned long val, void *data)
+{
+        struct s3c24xx_i2c *i2c = freq_to_i2c(nb);
+        unsigned long flags;
+        unsigned int got;
+        int delta_f;
+        int ret;
+
+        delta_f = clk_get_rate(i2c->clk) - i2c->clkrate;
+
+        /* if we're post-change and the input clock has slowed down
+         * or at pre-change and the clock is about to speed up, then
+         * adjust our clock rate. <0 is slow, >0 speedup.
+         */
+
+        if ((val == CPUFREQ_POSTCHANGE && delta_f < 0) ||
+            (val == CPUFREQ_PRECHANGE && delta_f > 0)) {
+                spin_lock_irqsave(&i2c->lock, flags);
+                ret = s3c24xx_i2c_clockrate(i2c, &got);
+                spin_unlock_irqrestore(&i2c->lock, flags);
+
+                if (ret < 0)
+                        dev_err(i2c->dev, "cannot find frequency\n");
+                else
+                        dev_info(i2c->dev, "setting freq %d\n", got);
+        }
+
+        return 0;
+}
+
+static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c)
+{
+        i2c->freq_transition.notifier_call = s3c24xx_i2c_cpufreq_transition;
+
+        return cpufreq_register_notifier(&i2c->freq_transition,
+                                         CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
+{
+        cpufreq_unregister_notifier(&i2c->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+#else
+static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c)
+{
         return 0;
 }
 
+static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
+{
+}
+#endif
+
 /* s3c24xx_i2c_init
  *
  * initialise the controller, set the IO lines and frequency 
@@ -719,9 +797,12 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
 
+        writel(iicon, i2c->regs + S3C2410_IICCON);
+
         /* we need to work out the divisors for the clock... */
 
-        if (s3c24xx_i2c_getdivisor(i2c, pdata, &iicon, &freq) != 0) {
+        if (s3c24xx_i2c_clockrate(i2c, &freq) != 0) {
+                writel(0, i2c->regs + S3C2410_IICCON);
                 dev_err(i2c->dev, "cannot meet bus frequency required\n");
                 return -EINVAL;
         }
@@ -730,8 +811,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
         dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
-        
-        writel(iicon, i2c->regs + S3C2410_IICCON);
 
         /* check for s3c2440 i2c controller  */
 
@@ -752,9 +831,12 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
         struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
+        struct s3c2410_platform_i2c *pdata;
         struct resource *res;
         int ret;
 
+        pdata = s3c24xx_i2c_get_platformdata(&pdev->dev);
+
         /* find the clock and enable it */
 
         i2c->dev = &pdev->dev;
@@ -832,17 +914,34 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
                 (unsigned long)res->start);
 
-        ret = i2c_add_adapter(&i2c->adap);
+        ret = s3c24xx_i2c_register_cpufreq(i2c);
         if (ret < 0) {
-                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
+                dev_err(&pdev->dev, "failed to register cpufreq notifier\n");
                 goto err_irq;
         }
 
+        /* Note, previous versions of the driver used i2c_add_adapter()
+         * to add the bus at any number. We now pass the bus number via
+         * the platform data, so if unset it will now default to always
+         * being bus 0.
+         */
+
+        i2c->adap.nr = pdata->bus_num;
+
+        ret = i2c_add_numbered_adapter(&i2c->adap);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
+                goto err_cpufreq;
+        }
+
         platform_set_drvdata(pdev, i2c);
 
         dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
         return 0;
 
+ err_cpufreq:
+        s3c24xx_i2c_deregister_cpufreq(i2c);
+
  err_irq:
         free_irq(i2c->irq->start, i2c);
 
@@ -870,6 +969,8 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 {
         struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
+        s3c24xx_i2c_deregister_cpufreq(i2c);
+
         i2c_del_adapter(&i2c->adap);
         free_irq(i2c->irq->start, i2c);
 
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 8486abc457ed..c600ab7f93e8 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -158,25 +158,18 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
         memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata));
         pdata = &priv->pdata;
 
-        res = request_mem_region(res->start, res_size(res), pdev->name);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "failed to request I/O memory\n");
-                error = -EBUSY;
-                goto err1;
-        }
-
         priv->iomem_base = ioremap_nocache(res->start, res_size(res));
         if (priv->iomem_base == NULL) {
                 dev_err(&pdev->dev, "failed to remap I/O memory\n");
                 error = -ENXIO;
-                goto err2;
+                goto err1;
         }
 
         priv->input = input_allocate_device();
         if (!priv->input) {
                 dev_err(&pdev->dev, "failed to allocate input device\n");
                 error = -ENOMEM;
-                goto err3;
+                goto err2;
         }
 
         input = priv->input;
@@ -194,7 +187,7 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
         error = request_irq(irq, sh_keysc_isr, 0, pdev->name, pdev);
         if (error) {
                 dev_err(&pdev->dev, "failed to request IRQ\n");
-                goto err4;
+                goto err3;
         }
 
         for (i = 0; i < SH_KEYSC_MAXKEYS; i++) {
@@ -206,7 +199,7 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
         error = input_register_device(input);
         if (error) {
                 dev_err(&pdev->dev, "failed to register input device\n");
-                goto err5;
+                goto err4;
         }
 
         iowrite16((sh_keysc_mode[pdata->mode].kymd << 8) |
@@ -214,14 +207,12 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
         iowrite16(0, priv->iomem_base + KYOUTDR_OFFS);
         iowrite16(KYCR2_IRQ_LEVEL, priv->iomem_base + KYCR2_OFFS);
         return 0;
- err5:
-        free_irq(irq, pdev);
  err4:
-        input_free_device(input);
+        free_irq(irq, pdev);
  err3:
-        iounmap(priv->iomem_base);
+        input_free_device(input);
  err2:
-        release_mem_region(res->start, res_size(res));
+        iounmap(priv->iomem_base);
  err1:
         platform_set_drvdata(pdev, NULL);
         kfree(priv);
@@ -232,7 +223,6 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
 static int __devexit sh_keysc_remove(struct platform_device *pdev)
 {
         struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
-        struct resource *res;
 
         iowrite16(KYCR2_IRQ_DISABLED, priv->iomem_base + KYCR2_OFFS);
 
@@ -240,9 +230,6 @@ static int __devexit sh_keysc_remove(struct platform_device *pdev)
         free_irq(platform_get_irq(pdev, 0), pdev);
         iounmap(priv->iomem_base);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res_size(res));
-
         platform_set_drvdata(pdev, NULL);
         kfree(priv);
         return 0;
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 2bcfa0b35061..223d56d5555b 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
-#include <linux/smp_lock.h>
 
 static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 78f2abb5c11b..2f12d60eee3b 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -63,8 +63,9 @@ static LIST_HEAD(serio_list);
 static struct bus_type serio_bus;
 
 static void serio_add_port(struct serio *serio);
-static void serio_reconnect_port(struct serio *serio);
+static int serio_reconnect_port(struct serio *serio);
 static void serio_disconnect_port(struct serio *serio);
+static void serio_reconnect_chain(struct serio *serio);
 static void serio_attach_driver(struct serio_driver *drv);
 
 static int serio_connect_driver(struct serio *serio, struct serio_driver *drv)
@@ -161,6 +162,7 @@ static void serio_find_driver(struct serio *serio)
 enum serio_event_type {
         SERIO_RESCAN_PORT,
         SERIO_RECONNECT_PORT,
+        SERIO_RECONNECT_CHAIN,
         SERIO_REGISTER_PORT,
         SERIO_ATTACH_DRIVER,
 };
@@ -315,6 +317,10 @@ static void serio_handle_event(void)
                                 serio_find_driver(event->object);
                                 break;
 
+                        case SERIO_RECONNECT_CHAIN:
+                                serio_reconnect_chain(event->object);
+                                break;
+
                         case SERIO_ATTACH_DRIVER:
                                 serio_attach_driver(event->object);
                                 break;
@@ -470,7 +476,7 @@ static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *
         if (!strncmp(buf, "none", count)) {
                 serio_disconnect_port(serio);
         } else if (!strncmp(buf, "reconnect", count)) {
-                serio_reconnect_port(serio);
+                serio_reconnect_chain(serio);
         } else if (!strncmp(buf, "rescan", count)) {
                 serio_disconnect_port(serio);
                 serio_find_driver(serio);
@@ -620,14 +626,30 @@ static void serio_destroy_port(struct serio *serio)
 }
 
 /*
+ * Reconnect serio port (re-initialize attached device).
+ * If reconnect fails (old device is no longer attached or
+ * there was no device to begin with) we do full rescan in
+ * hope of finding a driver for the port.
+ */
+static int serio_reconnect_port(struct serio *serio)
+{
+        int error = serio_reconnect_driver(serio);
+
+        if (error) {
+                serio_disconnect_port(serio);
+                serio_find_driver(serio);
+        }
+
+        return error;
+}
+
+/*
  * Reconnect serio port and all its children (re-initialize attached devices)
  */
-static void serio_reconnect_port(struct serio *serio)
+static void serio_reconnect_chain(struct serio *serio)
 {
         do {
-                if (serio_reconnect_driver(serio)) {
-                        serio_disconnect_port(serio);
-                        serio_find_driver(serio);
+                if (serio_reconnect_port(serio)) {
                         /* Ok, old children are now gone, we are done */
                         break;
                 }
@@ -673,7 +695,7 @@ void serio_rescan(struct serio *serio)
 
 void serio_reconnect(struct serio *serio)
 {
-        serio_queue_event(serio, NULL, SERIO_RECONNECT_PORT);
+        serio_queue_event(serio, NULL, SERIO_RECONNECT_CHAIN);
 }
 
 /*
@@ -927,19 +949,16 @@ static int serio_suspend(struct device *dev, pm_message_t state)
 
 static int serio_resume(struct device *dev)
 {
-        struct serio *serio = to_serio_port(dev);
-
-        if (dev->power.power_state.event != PM_EVENT_ON &&
-            serio_reconnect_driver(serio)) {
-                /*
-                 * Driver re-probing can take a while, so better let kseriod
-                 * deal with it.
-                 */
-                serio_rescan(serio);
+        /*
+         * Driver reconnect can take a while, so better let kseriod
+         * deal with it.
+         */
+        if (dev->power.power_state.event != PM_EVENT_ON) {
+                dev->power.power_state = PMSG_ON;
+                serio_queue_event(to_serio_port(dev), NULL,
+                                  SERIO_RECONNECT_PORT);
         }
 
-        dev->power.power_state = PMSG_ON;
-
         return 0;
 }
 #endif /* CONFIG_PM */
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index e57366521572..6e60a97a234c 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -205,6 +205,18 @@ config TOUCHSCREEN_TOUCHWIN
           To compile this driver as a module, choose M here: the
           module will be called touchwin.
 
+config TOUCHSCREEN_ATMEL_TSADCC
+        tristate "Atmel Touchscreen Interface"
+        depends on ARCH_AT91SAM9RL
+        help
+          Say Y here if you have a 4-wire touchscreen connected to the
+          ADC Controller on your Atmel SoC (such as the AT91SAM9RL).
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called atmel_tsadcc.
+
 config TOUCHSCREEN_UCB1400
         tristate "Philips UCB1400 touchscreen"
         select AC97_BUS
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 39a804cd80f1..15cf29079489 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -7,6 +7,7 @@
 wm97xx-ts-y := wm97xx-core.o
 
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
+obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)  += atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_BITSY)         += h3600_ts_input.o
 obj-$(CONFIG_TOUCHSCREEN_CORGI)         += corgi_ts.o
 obj-$(CONFIG_TOUCHSCREEN_GUNZE)         += gunze.o
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 907a45fe9d40..ce6f48c695f5 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -517,7 +517,9 @@ static void ads7846_rx(void *ads)
         if (x == MAX_12BIT)
                 x = 0;
 
-        if (likely(x && z1)) {
+        if (ts->model == 7843) {
+                Rt = ts->pressure_max / 2;
+        } else if (likely(x && z1)) {
                 /* compute touch pressure resistance using equation #2 */
                 Rt = z2;
                 Rt -= z1;
@@ -525,11 +527,9 @@ static void ads7846_rx(void *ads)
                 Rt *= ts->x_plate_ohms;
                 Rt /= z1;
                 Rt = (Rt + 2047) >> 12;
-        } else
+        } else {
                 Rt = 0;
-
-        if (ts->model == 7843)
-                Rt = ts->pressure_max / 2;
+        }
 
         /* Sample found inconsistent by debouncing or pressure is beyond
          * the maximum. Don't report it to user space, repeat at least
@@ -633,19 +633,17 @@ static void ads7846_rx_val(void *ads)
         struct ads7846 *ts = ads;
         struct spi_message *m;
         struct spi_transfer *t;
-        u16 *rx_val;
         int val;
         int action;
         int status;
 
         m = &ts->msg[ts->msg_idx];
         t = list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
-        rx_val = t->rx_buf;
 
         /* adjust:  on-wire is a must-ignore bit, a BE12 value, then padding;
          * built from two 8 bit values written msb-first.
          */
-        val = be16_to_cpu(*rx_val) >> 3;
+        val = be16_to_cpup((__be16 *)t->rx_buf) >> 3;
 
         action = ts->filter(ts->filter_data, ts->msg_idx, &val);
         switch (action) {
@@ -659,7 +657,7 @@ static void ads7846_rx_val(void *ads)
                 m = ts->last_msg;
                 break;
         case ADS7846_FILTER_OK:
-                *rx_val = val;
+                *(u16 *)t->rx_buf = val;
                 ts->tc.ignore = 0;
                 m = &ts->msg[++ts->msg_idx];
                 break;
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
new file mode 100644
index 000000000000..eee126b19e8b
--- /dev/null
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -0,0 +1,332 @@
+/*
+ *  Atmel Touch Screen Driver
+ *
+ *  Copyright (c) 2008 ATMEL
+ *  Copyright (c) 2008 Dan Liang
+ *  Copyright (c) 2008 TimeSys Corporation
+ *  Copyright (c) 2008 Justin Waters
+ *
+ *  Based on touchscreen code from Atmel Corporation.
+ *
+ *  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.
+ */
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+/* Register definitions based on AT91SAM9RL64 preliminary draft datasheet */
+
+#define ATMEL_TSADCC_CR         0x00    /* Control register */
+#define   ATMEL_TSADCC_SWRST    (1 << 0)        /* Software Reset*/
+#define   ATMEL_TSADCC_START    (1 << 1)        /* Start conversion */
+
+#define ATMEL_TSADCC_MR         0x04    /* Mode register */
+#define   ATMEL_TSADCC_TSAMOD   (3    <<  0)    /* ADC mode */
+#define     ATMEL_TSADCC_TSAMOD_ADC_ONLY_MODE   (0x0)   /* ADC Mode */
+#define     ATMEL_TSADCC_TSAMOD_TS_ONLY_MODE    (0x1)   /* Touch Screen Only Mode */
+#define   ATMEL_TSADCC_LOWRES   (1    <<  4)    /* Resolution selection */
+#define   ATMEL_TSADCC_SLEEP    (1    <<  5)    /* Sleep mode */
+#define   ATMEL_TSADCC_PENDET   (1    <<  6)    /* Pen Detect selection */
+#define   ATMEL_TSADCC_PRESCAL  (0x3f <<  8)    /* Prescalar Rate Selection */
+#define   ATMEL_TSADCC_STARTUP  (0x7f << 16)    /* Start Up time */
+#define   ATMEL_TSADCC_SHTIM    (0xf  << 24)    /* Sample & Hold time */
+#define   ATMEL_TSADCC_PENDBC   (0xf  << 28)    /* Pen Detect debouncing time */
+
+#define ATMEL_TSADCC_TRGR       0x08    /* Trigger register */
+#define   ATMEL_TSADCC_TRGMOD   (7      <<  0)  /* Trigger mode */
+#define     ATMEL_TSADCC_TRGMOD_NONE            (0 << 0)
+#define     ATMEL_TSADCC_TRGMOD_EXT_RISING      (1 << 0)
+#define     ATMEL_TSADCC_TRGMOD_EXT_FALLING     (2 << 0)
+#define     ATMEL_TSADCC_TRGMOD_EXT_ANY         (3 << 0)
+#define     ATMEL_TSADCC_TRGMOD_PENDET          (4 << 0)
+#define     ATMEL_TSADCC_TRGMOD_PERIOD          (5 << 0)
+#define     ATMEL_TSADCC_TRGMOD_CONTINUOUS      (6 << 0)
+#define   ATMEL_TSADCC_TRGPER   (0xffff << 16)  /* Trigger period */
+
+#define ATMEL_TSADCC_TSR        0x0C    /* Touch Screen register */
+#define   ATMEL_TSADCC_TSFREQ   (0xf <<  0)     /* TS Frequency in Interleaved mode */
+#define   ATMEL_TSADCC_TSSHTIM  (0xf << 24)     /* Sample & Hold time */
+
+#define ATMEL_TSADCC_CHER       0x10    /* Channel Enable register */
+#define ATMEL_TSADCC_CHDR       0x14    /* Channel Disable register */
+#define ATMEL_TSADCC_CHSR       0x18    /* Channel Status register */
+#define   ATMEL_TSADCC_CH(n)    (1 << (n))      /* Channel number */
+
+#define ATMEL_TSADCC_SR         0x1C    /* Status register */
+#define   ATMEL_TSADCC_EOC(n)   (1 << ((n)+0))  /* End of conversion for channel N */
+#define   ATMEL_TSADCC_OVRE(n)  (1 << ((n)+8))  /* Overrun error for channel N */
+#define   ATMEL_TSADCC_DRDY     (1 << 16)       /* Data Ready */
+#define   ATMEL_TSADCC_GOVRE    (1 << 17)       /* General Overrun Error */
+#define   ATMEL_TSADCC_ENDRX    (1 << 18)       /* End of RX Buffer */
+#define   ATMEL_TSADCC_RXBUFF   (1 << 19)       /* TX Buffer full */
+#define   ATMEL_TSADCC_PENCNT   (1 << 20)       /* Pen contact */
+#define   ATMEL_TSADCC_NOCNT    (1 << 21)       /* No contact */
+
+#define ATMEL_TSADCC_LCDR       0x20    /* Last Converted Data register */
+#define   ATMEL_TSADCC_DATA     (0x3ff << 0)    /* Channel data */
+
+#define ATMEL_TSADCC_IER        0x24    /* Interrupt Enable register */
+#define ATMEL_TSADCC_IDR        0x28    /* Interrupt Disable register */
+#define ATMEL_TSADCC_IMR        0x2C    /* Interrupt Mask register */
+#define ATMEL_TSADCC_CDR0       0x30    /* Channel Data 0 */
+#define ATMEL_TSADCC_CDR1       0x34    /* Channel Data 1 */
+#define ATMEL_TSADCC_CDR2       0x38    /* Channel Data 2 */
+#define ATMEL_TSADCC_CDR3       0x3C    /* Channel Data 3 */
+#define ATMEL_TSADCC_CDR4       0x40    /* Channel Data 4 */
+#define ATMEL_TSADCC_CDR5       0x44    /* Channel Data 5 */
+
+#define ADC_CLOCK       1000000
+
+struct atmel_tsadcc {
+        struct input_dev        *input;
+        char                    phys[32];
+        struct clk              *clk;
+        int                     irq;
+};
+
+static void __iomem             *tsc_base;
+
+#define atmel_tsadcc_read(reg)          __raw_readl(tsc_base + (reg))
+#define atmel_tsadcc_write(reg, val)    __raw_writel((val), tsc_base + (reg))
+
+static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)
+{
+        struct input_dev *input_dev = ((struct atmel_tsadcc *)dev)->input;
+
+        unsigned int absx;
+        unsigned int absy;
+        unsigned int status;
+        unsigned int reg;
+
+        status = atmel_tsadcc_read(ATMEL_TSADCC_SR);
+        status &= atmel_tsadcc_read(ATMEL_TSADCC_IMR);
+
+        if (status & ATMEL_TSADCC_NOCNT) {
+                /* Contact lost */
+                reg = atmel_tsadcc_read(ATMEL_TSADCC_MR) | ATMEL_TSADCC_PENDBC;
+
+                atmel_tsadcc_write(ATMEL_TSADCC_MR, reg);
+                atmel_tsadcc_write(ATMEL_TSADCC_TRGR, ATMEL_TSADCC_TRGMOD_NONE);
+                atmel_tsadcc_write(ATMEL_TSADCC_IDR,
+                                   ATMEL_TSADCC_EOC(3) | ATMEL_TSADCC_NOCNT);
+                atmel_tsadcc_write(ATMEL_TSADCC_IER, ATMEL_TSADCC_PENCNT);
+
+                input_report_key(input_dev, BTN_TOUCH, 0);
+                input_sync(input_dev);
+
+        } else if (status & ATMEL_TSADCC_PENCNT) {
+                /* Pen detected */
+                reg = atmel_tsadcc_read(ATMEL_TSADCC_MR);
+                reg &= ~ATMEL_TSADCC_PENDBC;
+
+                atmel_tsadcc_write(ATMEL_TSADCC_IDR, ATMEL_TSADCC_PENCNT);
+                atmel_tsadcc_write(ATMEL_TSADCC_MR, reg);
+                atmel_tsadcc_write(ATMEL_TSADCC_IER,
+                                   ATMEL_TSADCC_EOC(3) | ATMEL_TSADCC_NOCNT);
+                atmel_tsadcc_write(ATMEL_TSADCC_TRGR,
+                                   ATMEL_TSADCC_TRGMOD_PERIOD | (0x0FFF << 16));
+
+        } else if (status & ATMEL_TSADCC_EOC(3)) {
+                /* Conversion finished */
+
+                absx = atmel_tsadcc_read(ATMEL_TSADCC_CDR3) << 10;
+                absx /= atmel_tsadcc_read(ATMEL_TSADCC_CDR2);
+
+                absy = atmel_tsadcc_read(ATMEL_TSADCC_CDR1) << 10;
+                absy /= atmel_tsadcc_read(ATMEL_TSADCC_CDR0);
+
+                input_report_abs(input_dev, ABS_X, absx);
+                input_report_abs(input_dev, ABS_Y, absy);
+                input_report_key(input_dev, BTN_TOUCH, 1);
+                input_sync(input_dev);
+        }
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
+{
+        struct atmel_tsadcc     *ts_dev;
+        struct input_dev        *input_dev;
+        struct resource         *res;
+        int             err = 0;
+        unsigned int    prsc;
+        unsigned int    reg;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "no mmio resource defined.\n");
+                return -ENXIO;
+        }
+
+        /* Allocate memory for device */
+        ts_dev = kzalloc(sizeof(struct atmel_tsadcc), GFP_KERNEL);
+        if (!ts_dev) {
+                dev_err(&pdev->dev, "failed to allocate memory.\n");
+                return -ENOMEM;
+        }
+        platform_set_drvdata(pdev, ts_dev);
+
+        input_dev = input_allocate_device();
+        if (!input_dev) {
+                dev_err(&pdev->dev, "failed to allocate input device.\n");
+                err = -EBUSY;
+                goto err_free_mem;
+        }
+
+        ts_dev->irq = platform_get_irq(pdev, 0);
+        if (ts_dev->irq < 0) {
+                dev_err(&pdev->dev, "no irq ID is designated.\n");
+                err = -ENODEV;
+                goto err_free_dev;
+        }
+
+        if (!request_mem_region(res->start, res->end - res->start + 1,
+                                "atmel tsadcc regs")) {
+                dev_err(&pdev->dev, "resources is unavailable.\n");
+                err = -EBUSY;
+                goto err_free_dev;
+        }
+
+        tsc_base = ioremap(res->start, res->end - res->start + 1);
+        if (!tsc_base) {
+                dev_err(&pdev->dev, "failed to map registers.\n");
+                err = -ENOMEM;
+                goto err_release_mem;
+        }
+
+        err = request_irq(ts_dev->irq, atmel_tsadcc_interrupt, IRQF_DISABLED,
+                        pdev->dev.driver->name, ts_dev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to allocate irq.\n");
+                goto err_unmap_regs;
+        }
+
+        ts_dev->clk = clk_get(&pdev->dev, "tsc_clk");
+        if (IS_ERR(ts_dev->clk)) {
+                dev_err(&pdev->dev, "failed to get ts_clk\n");
+                err = PTR_ERR(ts_dev->clk);
+                goto err_free_irq;
+        }
+
+        ts_dev->input = input_dev;
+
+        snprintf(ts_dev->phys, sizeof(ts_dev->phys),
+                 "%s/input0", pdev->dev.bus_id);
+
+        input_dev->name = "atmel touch screen controller";
+        input_dev->phys = ts_dev->phys;
+        input_dev->dev.parent = &pdev->dev;
+
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+        input_set_abs_params(input_dev, ABS_X, 0, 0x3FF, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x3FF, 0, 0);
+
+        /* clk_enable() always returns 0, no need to check it */
+        clk_enable(ts_dev->clk);
+
+        prsc = clk_get_rate(ts_dev->clk);
+        dev_info(&pdev->dev, "Master clock is set at: %d Hz\n", prsc);
+
+        prsc = prsc / ADC_CLOCK / 2 - 1;
+
+        reg = ATMEL_TSADCC_TSAMOD_TS_ONLY_MODE          |
+                ((0x00 << 5) & ATMEL_TSADCC_SLEEP)      |       /* Normal Mode */
+                ((0x01 << 6) & ATMEL_TSADCC_PENDET)     |       /* Enable Pen Detect */
+                ((prsc << 8) & ATMEL_TSADCC_PRESCAL)    |       /* PRESCAL */
+                ((0x13 << 16) & ATMEL_TSADCC_STARTUP)   |       /* STARTUP */
+                ((0x0F << 28) & ATMEL_TSADCC_PENDBC);           /* PENDBC */
+
+        atmel_tsadcc_write(ATMEL_TSADCC_CR, ATMEL_TSADCC_SWRST);
+        atmel_tsadcc_write(ATMEL_TSADCC_MR, reg);
+        atmel_tsadcc_write(ATMEL_TSADCC_TRGR, ATMEL_TSADCC_TRGMOD_NONE);
+        atmel_tsadcc_write(ATMEL_TSADCC_TSR, (0x3 << 24) & ATMEL_TSADCC_TSSHTIM);
+
+        atmel_tsadcc_read(ATMEL_TSADCC_SR);
+        atmel_tsadcc_write(ATMEL_TSADCC_IER, ATMEL_TSADCC_PENCNT);
+
+        /* All went ok, so register to the input system */
+        err = input_register_device(input_dev);
+        if (err)
+                goto err_fail;
+
+        return 0;
+
+err_fail:
+        clk_disable(ts_dev->clk);
+        clk_put(ts_dev->clk);
+err_free_irq:
+        free_irq(ts_dev->irq, ts_dev);
+err_unmap_regs:
+        iounmap(tsc_base);
+err_release_mem:
+        release_mem_region(res->start, res->end - res->start + 1);
+err_free_dev:
+        input_free_device(ts_dev->input);
+err_free_mem:
+        kfree(ts_dev);
+        return err;
+}
+
+static int __devexit atmel_tsadcc_remove(struct platform_device *pdev)
+{
+        struct atmel_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
+        struct resource *res;
+
+        free_irq(ts_dev->irq, ts_dev);
+
+        input_unregister_device(ts_dev->input);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        iounmap(tsc_base);
+        release_mem_region(res->start, res->end - res->start + 1);
+
+        clk_disable(ts_dev->clk);
+        clk_put(ts_dev->clk);
+
+        kfree(ts_dev);
+
+        return 0;
+}
+
+static struct platform_driver atmel_tsadcc_driver = {
+        .probe          = atmel_tsadcc_probe,
+        .remove         = __devexit_p(atmel_tsadcc_remove),
+        .driver         = {
+                .name   = "atmel_tsadcc",
+        },
+};
+
+static int __init atmel_tsadcc_init(void)
+{
+        return platform_driver_register(&atmel_tsadcc_driver);
+}
+
+static void __exit atmel_tsadcc_exit(void)
+{
+        platform_driver_unregister(&atmel_tsadcc_driver);
+}
+
+module_init(atmel_tsadcc_init);
+module_exit(atmel_tsadcc_exit);
+
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Atmel TouchScreen Driver");
+MODULE_AUTHOR("Dan Liang <dan.liang@atmel.com>");
+
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 4e9d8eece2e0..d0e13fc4a88c 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -195,7 +195,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
 {
         if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) {
                 /* Disable Interrupt */
-                set_irq_type(corgi_ts->irq_gpio, IRQT_NOEDGE);
+                set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_NONE);
                 if (read_xydata(corgi_ts)) {
                         corgi_ts->pendown = 1;
                         new_data(corgi_ts);
@@ -214,7 +214,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
                 }
 
                 /* Enable Falling Edge */
-                set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+                set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
                 corgi_ts->pendown = 0;
         }
 }
@@ -258,7 +258,7 @@ static int corgits_resume(struct platform_device *dev)
 
         corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
         /* Enable Falling Edge */
-        set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+        set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
         corgi_ts->power_mode = PWR_MODE_ACTIVE;
 
         return 0;
@@ -333,7 +333,7 @@ static int __init corgits_probe(struct platform_device *pdev)
         corgi_ts->power_mode = PWR_MODE_ACTIVE;
 
         /* Enable Falling Edge */
-        set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+        set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
 
         return 0;
 
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index a79f029b91c0..590a1379aa32 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -198,7 +198,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm)
                 switch (wm->id) {
                 case WM9705_ID2:
                         wm->pen_irq = IRQ_GPIO(4);
-                        set_irq_type(IRQ_GPIO(4), IRQT_BOTHEDGE);
+                        set_irq_type(IRQ_GPIO(4), IRQ_TYPE_EDGE_BOTH);
                         break;
                 case WM9712_ID2:
                 case WM9713_ID2:
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 917968530e1e..3231814e7efa 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1988,8 +1988,7 @@ setup_hw(struct hfc_pci *hc)
         printk(KERN_INFO
                 "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n",
                 (u_long) hc->hw.pci_io, (u_long) hc->hw.fifos,
-                (u_long) virt_to_bus(hc->hw.fifos),
-                hc->irq, HZ);
+                (u_long) hc->hw.dmahandle, hc->irq, HZ);
         /* enable memory mapped ports, disable busmaster */
         pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO);
         hc->hw.int_m2 = 0;
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index f5ad888ee71e..a7915a156c04 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -2030,7 +2030,7 @@ release_l2(struct layer2 *l2)
         skb_queue_purge(&l2->down_queue);
         ReleaseWin(l2);
         if (test_bit(FLG_LAPD, &l2->flag)) {
-                release_tei(l2);
+                TEIrelease(l2);
                 if (l2->ch.st)
                         l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D,
                             CLOSE_CHANNEL, NULL);
diff --git a/drivers/isdn/mISDN/layer2.h b/drivers/isdn/mISDN/layer2.h
index de2dd02056a3..6293f80dc2d3 100644
--- a/drivers/isdn/mISDN/layer2.h
+++ b/drivers/isdn/mISDN/layer2.h
@@ -96,7 +96,7 @@ extern int		tei_l2(struct layer2 *, u_int, u_long arg);
 
 /* from tei.c */
 extern int              l2_tei(struct layer2 *, u_int, u_long arg);
-extern void             release_tei(struct layer2 *);
+extern void             TEIrelease(struct layer2 *);
 extern int              TEIInit(u_int *);
 extern void             TEIFree(void);
 
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 56a76a0ffddd..6fbae42127bf 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg)
 }
 
 void
-release_tei(struct layer2 *l2)
+TEIrelease(struct layer2 *l2)
 {
         struct teimgr   *tm = l2->tm;
         u_long          flags;
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 5eea4356d703..90663e01a56e 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -135,6 +135,7 @@ static void unmap_switcher(void)
         /* Now we just need to free the pages we copied the switcher into */
         for (i = 0; i < TOTAL_SWITCHER_PAGES; i++)
                 __free_pages(switcher_page[i], 0);
+        kfree(switcher_page);
 }
 
 /*H:032
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 0414ddf87587..a1039068f95c 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -406,7 +406,8 @@ void load_guest_idt_entry(struct lg_cpu *cpu, unsigned int num, u32 lo, u32 hi)
  * deliver_trap() to bounce it back into the Guest. */
 static void default_idt_entry(struct desc_struct *idt,
                               int trap,
-                              const unsigned long handler)
+                              const unsigned long handler,
+                              const struct desc_struct *base)
 {
         /* A present interrupt gate. */
         u32 flags = 0x8e00;
@@ -415,6 +416,10 @@ static void default_idt_entry(struct desc_struct *idt,
          * the Guest to use the "int" instruction to trigger it. */
         if (trap == LGUEST_TRAP_ENTRY)
                 flags |= (GUEST_PL << 13);
+        else if (base)
+                /* Copy priv. level from what Guest asked for.  This allows
+                 * debug (int 3) traps from Guest userspace, for example. */
+                flags |= (base->b & 0x6000);
 
         /* Now pack it into the IDT entry in its weird format. */
         idt->a = (LGUEST_CS<<16) | (handler&0x0000FFFF);
@@ -428,7 +433,7 @@ void setup_default_idt_entries(struct lguest_ro_state *state,
         unsigned int i;
 
         for (i = 0; i < ARRAY_SIZE(state->guest_idt); i++)
-                default_idt_entry(&state->guest_idt[i], i, def[i]);
+                default_idt_entry(&state->guest_idt[i], i, def[i], NULL);
 }
 
 /*H:240 We don't use the IDT entries in the "struct lguest" directly, instead
@@ -442,6 +447,8 @@ void copy_traps(const struct lg_cpu *cpu, struct desc_struct *idt,
         /* We can simply copy the direct traps, otherwise we use the default
          * ones in the Switcher: they will return to the Host. */
         for (i = 0; i < ARRAY_SIZE(cpu->arch.idt); i++) {
+                const struct desc_struct *gidt = &cpu->arch.idt[i];
+
                 /* If no Guest can ever override this trap, leave it alone. */
                 if (!direct_trap(i))
                         continue;
@@ -449,12 +456,15 @@ void copy_traps(const struct lg_cpu *cpu, struct desc_struct *idt,
                 /* Only trap gates (type 15) can go direct to the Guest.
                  * Interrupt gates (type 14) disable interrupts as they are
                  * entered, which we never let the Guest do.  Not present
-                 * entries (type 0x0) also can't go direct, of course. */
-                if (idt_type(cpu->arch.idt[i].a, cpu->arch.idt[i].b) == 0xF)
-                        idt[i] = cpu->arch.idt[i];
+                 * entries (type 0x0) also can't go direct, of course.
+                 *
+                 * If it can't go direct, we still need to copy the priv. level:
+                 * they might want to give userspace access to a software
+                 * interrupt. */
+                if (idt_type(gidt->a, gidt->b) == 0xF)
+                        idt[i] = *gidt;
                 else
-                        /* Reset it to the default. */
-                        default_idt_entry(&idt[i], i, def[i]);
+                        default_idt_entry(&idt[i], i, def[i], gidt);
         }
 }
 
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 95dfda52b4f9..bf7942327bda 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -480,7 +480,7 @@ void __init lguest_arch_host_init(void)
                  * bit on its CPU, depending on the argument (0 == unset). */
                 on_each_cpu(adjust_pge, (void *)0, 1);
                 /* Turn off the feature in the global feature set. */
-                clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
+                clear_cpu_cap(&boot_cpu_data, X86_FEATURE_PGE);
         }
         put_online_cpus();
 };
@@ -491,7 +491,7 @@ void __exit lguest_arch_host_fini(void)
         /* If we had PGE before we started, turn it back on now. */
         get_online_cpus();
         if (cpu_had_pge) {
-                set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
+                set_cpu_cap(&boot_cpu_data, X86_FEATURE_PGE);
                 /* adjust_pge's argument "1" means set PGE. */
                 on_each_cpu(adjust_pge, (void *)1, 1);
         }
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index fea966d66f98..71dd65aa31b6 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -147,9 +147,12 @@ static struct priority_group *alloc_priority_group(void)
 static void free_pgpaths(struct list_head *pgpaths, struct dm_target *ti)
 {
         struct pgpath *pgpath, *tmp;
+        struct multipath *m = ti->private;
 
         list_for_each_entry_safe(pgpath, tmp, pgpaths, list) {
                 list_del(&pgpath->list);
+                if (m->hw_handler_name)
+                        scsi_dh_detach(bdev_get_queue(pgpath->path.dev->bdev));
                 dm_put_device(ti, pgpath->path.dev);
                 free_pgpath(pgpath);
         }
@@ -548,6 +551,7 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,
 {
         int r;
         struct pgpath *p;
+        struct multipath *m = ti->private;
 
         /* we need at least a path arg */
         if (as->argc < 1) {
@@ -566,6 +570,15 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,
                 goto bad;
         }
 
+        if (m->hw_handler_name) {
+                r = scsi_dh_attach(bdev_get_queue(p->path.dev->bdev),
+                                   m->hw_handler_name);
+                if (r < 0) {
+                        dm_put_device(ti, p->path.dev);
+                        goto bad;
+                }
+        }
+
         r = ps->type->add_path(ps, &p->path, as->argc, as->argv, &ti->error);
         if (r) {
                 dm_put_device(ti, p->path.dev);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 171afe7da6b6..cf6a817d5059 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -563,7 +563,7 @@ int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev
 
         DEB_EE(("dev:%p\n",dev));
 
-        if( VFL_TYPE_GRABBER == (*vid)->type ) {
+        if ((*vid)->vfl_type == VFL_TYPE_GRABBER) {
                 vv->video_minor = -1;
         } else {
                 vv->vbi_minor = -1;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index a5e62750eea3..e8bc7abf2409 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -656,7 +656,7 @@ static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *bu
 
                 /* if we have a user buffer, the first page may not be
                    aligned to a page boundary. */
-                pt1->offset = list->offset;
+                pt1->offset = dma->sglist->offset;
                 pt2->offset = pt1->offset+o1;
                 pt3->offset = pt1->offset+o2;
 
@@ -958,21 +958,18 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
         case VIDIOC_ENUM_FMT:
         {
                 struct v4l2_fmtdesc *f = arg;
-                int index;
 
                 switch (f->type) {
                 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                case V4L2_BUF_TYPE_VIDEO_OVERLAY: {
-                        index = f->index;
-                        if (index < 0 || index >= NUM_FORMATS) {
+                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                        if (f->index >= NUM_FORMATS)
                                 return -EINVAL;
-                        }
-                        memset(f,0,sizeof(*f));
-                        f->index = index;
-                        strlcpy((char *)f->description,formats[index].name,sizeof(f->description));
-                        f->pixelformat = formats[index].pixelformat;
+                        strlcpy((char *)f->description, formats[f->index].name,
+                                        sizeof(f->description));
+                        f->pixelformat = formats[f->index].pixelformat;
+                        f->flags = 0;
+                        memset(f->reserved, 0, sizeof(f->reserved));
                         break;
-                }
                 default:
                         return -EINVAL;
                 }
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 850d5689b14d..6f92beaa5ac8 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -21,9 +21,8 @@ config MEDIA_TUNER
         tristate
         default VIDEO_MEDIA && I2C
         depends on VIDEO_MEDIA && I2C
-        select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -138,8 +137,6 @@ config MEDIA_TUNER_QT1010
 config MEDIA_TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
         depends on VIDEO_MEDIA && I2C
-        depends on HOTPLUG
-        select FW_LOADER
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
@@ -147,8 +144,6 @@ config MEDIA_TUNER_XC2028
 config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
         depends on VIDEO_MEDIA && I2C
-        depends on HOTPLUG
-        select FW_LOADER
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon tuner XC5000 from Xceive.
@@ -162,4 +157,11 @@ config MEDIA_TUNER_MXL5005S
         help
           A driver for the silicon tuner MXL5005S from MaxLinear.
 
+config MEDIA_TUNER_MXL5007T
+        tristate "MaxLinear MxL5007T silicon tuner"
+        depends on VIDEO_MEDIA && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon tuner MxL5007T from MaxLinear.
+
 endif # MEDIA_TUNER_CUSTOMIZE
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 55f7e6706297..4dfbe5b8264f 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_MEDIA_TUNER_MT2266) += mt2266.o
 obj-$(CONFIG_MEDIA_TUNER_QT1010) += qt1010.o
 obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o
 obj-$(CONFIG_MEDIA_TUNER_MXL5005S) += mxl5005s.o
+obj-$(CONFIG_MEDIA_TUNER_MXL5007T) += mxl5007t.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/common/tuners/mt20xx.c
index fbcb28233737..35b763a16d53 100644
--- a/drivers/media/common/tuners/mt20xx.c
+++ b/drivers/media/common/tuners/mt20xx.c
@@ -148,7 +148,8 @@ static int mt2032_compute_freq(struct dvb_frontend *fe,
         tuner_dbg("mt2032: rfin=%d lo2=%d lo2n=%d lo2a=%d num=%d lo2freq=%d\n",
                   rfin,lo2,lo2n,lo2a,lo2num,lo2freq);
 
-        if(lo1a<0 || lo1a>7 || lo1n<17 ||lo1n>48 || lo2a<0 ||lo2a >7 ||lo2n<17 || lo2n>30) {
+        if (lo1a > 7 || lo1n < 17 || lo1n > 48 || lo2a > 7 || lo2n < 17 ||
+                        lo2n > 30) {
                 tuner_info("mt2032: frequency parameters out of range: %d %d %d %d\n",
                            lo1a, lo1n, lo2a,lo2n);
                 return(-1);
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
new file mode 100644
index 000000000000..cb25e43502fe
--- /dev/null
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -0,0 +1,1030 @@
+/*
+ *  mxl5007t.c - driver for the MaxLinear MxL5007T silicon tuner
+ *
+ *  Copyright (C) 2008 Michael Krufky <mkrufky@linuxtv.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/i2c.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
+#include "tuner-i2c.h"
+#include "mxl5007t.h"
+
+static DEFINE_MUTEX(mxl5007t_list_mutex);
+static LIST_HEAD(hybrid_tuner_instance_list);
+
+static int mxl5007t_debug;
+module_param_named(debug, mxl5007t_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debug level");
+
+/* ------------------------------------------------------------------------- */
+
+#define mxl_printk(kern, fmt, arg...) \
+        printk(kern "%s: " fmt "\n", __func__, ##arg)
+
+#define mxl_err(fmt, arg...) \
+        mxl_printk(KERN_ERR, "%d: " fmt, __LINE__, ##arg)
+
+#define mxl_warn(fmt, arg...) \
+        mxl_printk(KERN_WARNING, fmt, ##arg)
+
+#define mxl_info(fmt, arg...) \
+        mxl_printk(KERN_INFO, fmt, ##arg)
+
+#define mxl_debug(fmt, arg...)                          \
+({                                                      \
+        if (mxl5007t_debug)                             \
+                mxl_printk(KERN_DEBUG, fmt, ##arg);     \
+})
+
+#define mxl_fail(ret)                                                   \
+({                                                                      \
+        int __ret;                                                      \
+        __ret = (ret < 0);                                              \
+        if (__ret)                                                      \
+                mxl_printk(KERN_ERR, "error %d on line %d",             \
+                           ret, __LINE__);                              \
+        __ret;                                                          \
+})
+
+/* ------------------------------------------------------------------------- */
+
+#define MHz 1000000
+
+enum mxl5007t_mode {
+        MxL_MODE_OTA_DVBT_ATSC        =    0,
+        MxL_MODE_OTA_NTSC_PAL_GH      =    1,
+        MxL_MODE_OTA_PAL_IB           =    2,
+        MxL_MODE_OTA_PAL_D_SECAM_KL   =    3,
+        MxL_MODE_OTA_ISDBT            =    4,
+        MxL_MODE_CABLE_DIGITAL        = 0x10,
+        MxL_MODE_CABLE_NTSC_PAL_GH    = 0x11,
+        MxL_MODE_CABLE_PAL_IB         = 0x12,
+        MxL_MODE_CABLE_PAL_D_SECAM_KL = 0x13,
+        MxL_MODE_CABLE_SCTE40         = 0x14,
+};
+
+enum mxl5007t_chip_version {
+        MxL_UNKNOWN_ID     = 0x00,
+        MxL_5007_V1_F1     = 0x11,
+        MxL_5007_V1_F2     = 0x12,
+        MxL_5007_V2_100_F1 = 0x21,
+        MxL_5007_V2_100_F2 = 0x22,
+        MxL_5007_V2_200_F1 = 0x23,
+        MxL_5007_V2_200_F2 = 0x24,
+};
+
+struct reg_pair_t {
+        u8 reg;
+        u8 val;
+};
+
+/* ------------------------------------------------------------------------- */
+
+static struct reg_pair_t init_tab[] = {
+        { 0x0b, 0x44 }, /* XTAL */
+        { 0x0c, 0x60 }, /* IF */
+        { 0x10, 0x00 }, /* MISC */
+        { 0x12, 0xca }, /* IDAC */
+        { 0x16, 0x90 }, /* MODE */
+        { 0x32, 0x38 }, /* MODE Analog/Digital */
+        { 0xd8, 0x18 }, /* CLK_OUT_ENABLE */
+        { 0x2c, 0x34 }, /* OVERRIDE */
+        { 0x4d, 0x40 }, /* OVERRIDE */
+        { 0x7f, 0x02 }, /* OVERRIDE */
+        { 0x9a, 0x52 }, /* OVERRIDE */
+        { 0x48, 0x5a }, /* OVERRIDE */
+        { 0x76, 0x1a }, /* OVERRIDE */
+        { 0x6a, 0x48 }, /* OVERRIDE */
+        { 0x64, 0x28 }, /* OVERRIDE */
+        { 0x66, 0xe6 }, /* OVERRIDE */
+        { 0x35, 0x0e }, /* OVERRIDE */
+        { 0x7e, 0x01 }, /* OVERRIDE */
+        { 0x83, 0x00 }, /* OVERRIDE */
+        { 0x04, 0x0b }, /* OVERRIDE */
+        { 0x05, 0x01 }, /* TOP_MASTER_ENABLE */
+        { 0, 0 }
+};
+
+static struct reg_pair_t init_tab_cable[] = {
+        { 0x0b, 0x44 }, /* XTAL */
+        { 0x0c, 0x60 }, /* IF */
+        { 0x10, 0x00 }, /* MISC */
+        { 0x12, 0xca }, /* IDAC */
+        { 0x16, 0x90 }, /* MODE */
+        { 0x32, 0x38 }, /* MODE A/D */
+        { 0x71, 0x3f }, /* TOP1 */
+        { 0x72, 0x3f }, /* TOP2 */
+        { 0x74, 0x3f }, /* TOP3 */
+        { 0xd8, 0x18 }, /* CLK_OUT_ENABLE */
+        { 0x2c, 0x34 }, /* OVERRIDE */
+        { 0x4d, 0x40 }, /* OVERRIDE */
+        { 0x7f, 0x02 }, /* OVERRIDE */
+        { 0x9a, 0x52 }, /* OVERRIDE */
+        { 0x48, 0x5a }, /* OVERRIDE */
+        { 0x76, 0x1a }, /* OVERRIDE */
+        { 0x6a, 0x48 }, /* OVERRIDE */
+        { 0x64, 0x28 }, /* OVERRIDE */
+        { 0x66, 0xe6 }, /* OVERRIDE */
+        { 0x35, 0x0e }, /* OVERRIDE */
+        { 0x7e, 0x01 }, /* OVERRIDE */
+        { 0x04, 0x0b }, /* OVERRIDE */
+        { 0x68, 0xb4 }, /* OVERRIDE */
+        { 0x36, 0x00 }, /* OVERRIDE */
+        { 0x05, 0x01 }, /* TOP_MASTER_ENABLE */
+        { 0, 0 }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static struct reg_pair_t reg_pair_rftune[] = {
+        { 0x11, 0x00 }, /* abort tune */
+        { 0x13, 0x15 },
+        { 0x14, 0x40 },
+        { 0x15, 0x0e },
+        { 0x11, 0x02 }, /* start tune */
+        { 0, 0 }
+};
+
+/* ------------------------------------------------------------------------- */
+
+struct mxl5007t_state {
+        struct list_head hybrid_tuner_instance_list;
+        struct tuner_i2c_props i2c_props;
+
+        struct mutex lock;
+
+        struct mxl5007t_config *config;
+
+        enum mxl5007t_chip_version chip_id;
+
+        struct reg_pair_t tab_init[ARRAY_SIZE(init_tab)];
+        struct reg_pair_t tab_init_cable[ARRAY_SIZE(init_tab_cable)];
+        struct reg_pair_t tab_rftune[ARRAY_SIZE(reg_pair_rftune)];
+
+        u32 frequency;
+        u32 bandwidth;
+};
+
+/* ------------------------------------------------------------------------- */
+
+/* called by _init and _rftun to manipulate the register arrays */
+
+static void set_reg_bits(struct reg_pair_t *reg_pair, u8 reg, u8 mask, u8 val)
+{
+        unsigned int i = 0;
+
+        while (reg_pair[i].reg || reg_pair[i].val) {
+                if (reg_pair[i].reg == reg) {
+                        reg_pair[i].val &= ~mask;
+                        reg_pair[i].val |= val;
+                }
+                i++;
+
+        }
+        return;
+}
+
+static void copy_reg_bits(struct reg_pair_t *reg_pair1,
+                          struct reg_pair_t *reg_pair2)
+{
+        unsigned int i, j;
+
+        i = j = 0;
+
+        while (reg_pair1[i].reg || reg_pair1[i].val) {
+                while (reg_pair2[j].reg || reg_pair2[j].reg) {
+                        if (reg_pair1[i].reg != reg_pair2[j].reg) {
+                                j++;
+                                continue;
+                        }
+                        reg_pair2[j].val = reg_pair1[i].val;
+                        break;
+                }
+                i++;
+        }
+        return;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static void mxl5007t_set_mode_bits(struct mxl5007t_state *state,
+                                   enum mxl5007t_mode mode,
+                                   s32 if_diff_out_level)
+{
+        switch (mode) {
+        case MxL_MODE_OTA_DVBT_ATSC:
+                set_reg_bits(state->tab_init, 0x32, 0x0f, 0x06);
+                set_reg_bits(state->tab_init, 0x35, 0xff, 0x0e);
+                break;
+        case MxL_MODE_OTA_ISDBT:
+                set_reg_bits(state->tab_init, 0x32, 0x0f, 0x06);
+                set_reg_bits(state->tab_init, 0x35, 0xff, 0x12);
+                break;
+        case MxL_MODE_OTA_NTSC_PAL_GH:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x00);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                break;
+        case MxL_MODE_OTA_PAL_IB:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x10);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                break;
+        case MxL_MODE_OTA_PAL_D_SECAM_KL:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x20);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                break;
+        case MxL_MODE_CABLE_DIGITAL:
+                set_reg_bits(state->tab_init_cable, 0x71, 0xff, 0x01);
+                set_reg_bits(state->tab_init_cable, 0x72, 0xff,
+                             8 - if_diff_out_level);
+                set_reg_bits(state->tab_init_cable, 0x74, 0xff, 0x17);
+                break;
+        case MxL_MODE_CABLE_NTSC_PAL_GH:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x00);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                set_reg_bits(state->tab_init_cable, 0x71, 0xff, 0x01);
+                set_reg_bits(state->tab_init_cable, 0x72, 0xff,
+                             8 - if_diff_out_level);
+                set_reg_bits(state->tab_init_cable, 0x74, 0xff, 0x17);
+                break;
+        case MxL_MODE_CABLE_PAL_IB:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x10);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                set_reg_bits(state->tab_init_cable, 0x71, 0xff, 0x01);
+                set_reg_bits(state->tab_init_cable, 0x72, 0xff,
+                             8 - if_diff_out_level);
+                set_reg_bits(state->tab_init_cable, 0x74, 0xff, 0x17);
+                break;
+        case MxL_MODE_CABLE_PAL_D_SECAM_KL:
+                set_reg_bits(state->tab_init, 0x16, 0x70, 0x20);
+                set_reg_bits(state->tab_init, 0x32, 0xff, 0x85);
+                set_reg_bits(state->tab_init_cable, 0x71, 0xff, 0x01);
+                set_reg_bits(state->tab_init_cable, 0x72, 0xff,
+                             8 - if_diff_out_level);
+                set_reg_bits(state->tab_init_cable, 0x74, 0xff, 0x17);
+                break;
+        case MxL_MODE_CABLE_SCTE40:
+                set_reg_bits(state->tab_init_cable, 0x36, 0xff, 0x08);
+                set_reg_bits(state->tab_init_cable, 0x68, 0xff, 0xbc);
+                set_reg_bits(state->tab_init_cable, 0x71, 0xff, 0x01);
+                set_reg_bits(state->tab_init_cable, 0x72, 0xff,
+                             8 - if_diff_out_level);
+                set_reg_bits(state->tab_init_cable, 0x74, 0xff, 0x17);
+                break;
+        default:
+                mxl_fail(-EINVAL);
+        }
+        return;
+}
+
+static void mxl5007t_set_if_freq_bits(struct mxl5007t_state *state,
+                                      enum mxl5007t_if_freq if_freq,
+                                      int invert_if)
+{
+        u8 val;
+
+        switch (if_freq) {
+        case MxL_IF_4_MHZ:
+                val = 0x00;
+                break;
+        case MxL_IF_4_5_MHZ:
+                val = 0x20;
+                break;
+        case MxL_IF_4_57_MHZ:
+                val = 0x30;
+                break;
+        case MxL_IF_5_MHZ:
+                val = 0x40;
+                break;
+        case MxL_IF_5_38_MHZ:
+                val = 0x50;
+                break;
+        case MxL_IF_6_MHZ:
+                val = 0x60;
+                break;
+        case MxL_IF_6_28_MHZ:
+                val = 0x70;
+                break;
+        case MxL_IF_9_1915_MHZ:
+                val = 0x80;
+                break;
+        case MxL_IF_35_25_MHZ:
+                val = 0x90;
+                break;
+        case MxL_IF_36_15_MHZ:
+                val = 0xa0;
+                break;
+        case MxL_IF_44_MHZ:
+                val = 0xb0;
+                break;
+        default:
+                mxl_fail(-EINVAL);
+                return;
+        }
+        set_reg_bits(state->tab_init, 0x0c, 0xf0, val);
+
+        /* set inverted IF or normal IF */
+        set_reg_bits(state->tab_init, 0x0c, 0x08, invert_if ? 0x08 : 0x00);
+
+        return;
+}
+
+static void mxl5007t_set_xtal_freq_bits(struct mxl5007t_state *state,
+                                        enum mxl5007t_xtal_freq xtal_freq)
+{
+        u8 val;
+
+        switch (xtal_freq) {
+        case MxL_XTAL_16_MHZ:
+                val = 0x00; /* select xtal freq & Ref Freq */
+                break;
+        case MxL_XTAL_20_MHZ:
+                val = 0x11;
+                break;
+        case MxL_XTAL_20_25_MHZ:
+                val = 0x22;
+                break;
+        case MxL_XTAL_20_48_MHZ:
+                val = 0x33;
+                break;
+        case MxL_XTAL_24_MHZ:
+                val = 0x44;
+                break;
+        case MxL_XTAL_25_MHZ:
+                val = 0x55;
+                break;
+        case MxL_XTAL_25_14_MHZ:
+                val = 0x66;
+                break;
+        case MxL_XTAL_27_MHZ:
+                val = 0x77;
+                break;
+        case MxL_XTAL_28_8_MHZ:
+                val = 0x88;
+                break;
+        case MxL_XTAL_32_MHZ:
+                val = 0x99;
+                break;
+        case MxL_XTAL_40_MHZ:
+                val = 0xaa;
+                break;
+        case MxL_XTAL_44_MHZ:
+                val = 0xbb;
+                break;
+        case MxL_XTAL_48_MHZ:
+                val = 0xcc;
+                break;
+        case MxL_XTAL_49_3811_MHZ:
+                val = 0xdd;
+                break;
+        default:
+                mxl_fail(-EINVAL);
+                return;
+        }
+        set_reg_bits(state->tab_init, 0x0b, 0xff, val);
+
+        return;
+}
+
+static struct reg_pair_t *mxl5007t_calc_init_regs(struct mxl5007t_state *state,
+                                                  enum mxl5007t_mode mode)
+{
+        struct mxl5007t_config *cfg = state->config;
+
+        memcpy(&state->tab_init, &init_tab, sizeof(init_tab));
+        memcpy(&state->tab_init_cable, &init_tab_cable, sizeof(init_tab_cable));
+
+        mxl5007t_set_mode_bits(state, mode, cfg->if_diff_out_level);
+        mxl5007t_set_if_freq_bits(state, cfg->if_freq_hz, cfg->invert_if);
+        mxl5007t_set_xtal_freq_bits(state, cfg->xtal_freq_hz);
+
+        set_reg_bits(state->tab_init, 0x10, 0x40, cfg->loop_thru_enable << 6);
+
+        set_reg_bits(state->tab_init, 0xd8, 0x08, cfg->clk_out_enable << 3);
+
+        set_reg_bits(state->tab_init, 0x10, 0x07, cfg->clk_out_amp);
+
+        /* set IDAC to automatic mode control by AGC */
+        set_reg_bits(state->tab_init, 0x12, 0x80, 0x00);
+
+        if (mode >= MxL_MODE_CABLE_DIGITAL) {
+                copy_reg_bits(state->tab_init, state->tab_init_cable);
+                return state->tab_init_cable;
+        } else
+                return state->tab_init;
+}
+
+/* ------------------------------------------------------------------------- */
+
+enum mxl5007t_bw_mhz {
+        MxL_BW_6MHz = 6,
+        MxL_BW_7MHz = 7,
+        MxL_BW_8MHz = 8,
+};
+
+static void mxl5007t_set_bw_bits(struct mxl5007t_state *state,
+                                 enum mxl5007t_bw_mhz bw)
+{
+        u8 val;
+
+        switch (bw) {
+        case MxL_BW_6MHz:
+                val = 0x15; /* set DIG_MODEINDEX, DIG_MODEINDEX_A,
+                             * and DIG_MODEINDEX_CSF */
+                break;
+        case MxL_BW_7MHz:
+                val = 0x21;
+                break;
+        case MxL_BW_8MHz:
+                val = 0x3f;
+                break;
+        default:
+                mxl_fail(-EINVAL);
+                return;
+        }
+        set_reg_bits(state->tab_rftune, 0x13, 0x3f, val);
+
+        return;
+}
+
+static struct
+reg_pair_t *mxl5007t_calc_rf_tune_regs(struct mxl5007t_state *state,
+                                       u32 rf_freq, enum mxl5007t_bw_mhz bw)
+{
+        u32 dig_rf_freq = 0;
+        u32 temp;
+        u32 frac_divider = 1000000;
+        unsigned int i;
+
+        memcpy(&state->tab_rftune, &reg_pair_rftune, sizeof(reg_pair_rftune));
+
+        mxl5007t_set_bw_bits(state, bw);
+
+        /* Convert RF frequency into 16 bits =>
+         * 10 bit integer (MHz) + 6 bit fraction */
+        dig_rf_freq = rf_freq / MHz;
+
+        temp = rf_freq % MHz;
+
+        for (i = 0; i < 6; i++) {
+                dig_rf_freq <<= 1;
+                frac_divider /= 2;
+                if (temp > frac_divider) {
+                        temp -= frac_divider;
+                        dig_rf_freq++;
+                }
+        }
+
+        /* add to have shift center point by 7.8124 kHz */
+        if (temp > 7812)
+                dig_rf_freq++;
+
+        set_reg_bits(state->tab_rftune, 0x14, 0xff, (u8)dig_rf_freq);
+        set_reg_bits(state->tab_rftune, 0x15, 0xff, (u8)(dig_rf_freq >> 8));
+
+        return state->tab_rftune;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_write_reg(struct mxl5007t_state *state, u8 reg, u8 val)
+{
+        u8 buf[] = { reg, val };
+        struct i2c_msg msg = { .addr = state->i2c_props.addr, .flags = 0,
+                               .buf = buf, .len = 2 };
+        int ret;
+
+        ret = i2c_transfer(state->i2c_props.adap, &msg, 1);
+        if (ret != 1) {
+                mxl_err("failed!");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int mxl5007t_write_regs(struct mxl5007t_state *state,
+                               struct reg_pair_t *reg_pair)
+{
+        unsigned int i = 0;
+        int ret = 0;
+
+        while ((ret == 0) && (reg_pair[i].reg || reg_pair[i].val)) {
+                ret = mxl5007t_write_reg(state,
+                                         reg_pair[i].reg, reg_pair[i].val);
+                i++;
+        }
+        return ret;
+}
+
+static int mxl5007t_read_reg(struct mxl5007t_state *state, u8 reg, u8 *val)
+{
+        struct i2c_msg msg[] = {
+                { .addr = state->i2c_props.addr, .flags = 0,
+                  .buf = &reg, .len = 1 },
+                { .addr = state->i2c_props.addr, .flags = I2C_M_RD,
+                  .buf = val, .len = 1 },
+        };
+        int ret;
+
+        ret = i2c_transfer(state->i2c_props.adap, msg, 2);
+        if (ret != 2) {
+                mxl_err("failed!");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int mxl5007t_soft_reset(struct mxl5007t_state *state)
+{
+        u8 d = 0xff;
+        struct i2c_msg msg = { .addr = state->i2c_props.addr, .flags = 0,
+                               .buf = &d, .len = 1 };
+
+        int ret = i2c_transfer(state->i2c_props.adap, &msg, 1);
+
+        if (ret != 1) {
+                mxl_err("failed!");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int mxl5007t_tuner_init(struct mxl5007t_state *state,
+                               enum mxl5007t_mode mode)
+{
+        struct reg_pair_t *init_regs;
+        int ret;
+
+        ret = mxl5007t_soft_reset(state);
+        if (mxl_fail(ret))
+                goto fail;
+
+        /* calculate initialization reg array */
+        init_regs = mxl5007t_calc_init_regs(state, mode);
+
+        ret = mxl5007t_write_regs(state, init_regs);
+        if (mxl_fail(ret))
+                goto fail;
+        mdelay(1);
+
+        ret = mxl5007t_write_reg(state, 0x2c, 0x35);
+        mxl_fail(ret);
+fail:
+        return ret;
+}
+
+static int mxl5007t_tuner_rf_tune(struct mxl5007t_state *state, u32 rf_freq_hz,
+                                  enum mxl5007t_bw_mhz bw)
+{
+        struct reg_pair_t *rf_tune_regs;
+        int ret;
+
+        /* calculate channel change reg array */
+        rf_tune_regs = mxl5007t_calc_rf_tune_regs(state, rf_freq_hz, bw);
+
+        ret = mxl5007t_write_regs(state, rf_tune_regs);
+        if (mxl_fail(ret))
+                goto fail;
+        msleep(3);
+fail:
+        return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_synth_lock_status(struct mxl5007t_state *state,
+                                      int *rf_locked, int *ref_locked)
+{
+        u8 d;
+        int ret;
+
+        *rf_locked = 0;
+        *ref_locked = 0;
+
+        ret = mxl5007t_read_reg(state, 0xcf, &d);
+        if (mxl_fail(ret))
+                goto fail;
+
+        if ((d & 0x0c) == 0x0c)
+                *rf_locked = 1;
+
+        if ((d & 0x03) == 0x03)
+                *ref_locked = 1;
+fail:
+        return ret;
+}
+
+static int mxl5007t_check_rf_input_power(struct mxl5007t_state *state,
+                                         s32 *rf_input_level)
+{
+        u8 d1, d2;
+        int ret;
+
+        ret = mxl5007t_read_reg(state, 0xb7, &d1);
+        if (mxl_fail(ret))
+                goto fail;
+
+        ret = mxl5007t_read_reg(state, 0xbf, &d2);
+        if (mxl_fail(ret))
+                goto fail;
+
+        d2 = d2 >> 4;
+        if (d2 > 7)
+                d2 += 0xf0;
+
+        *rf_input_level = (s32)(d1 + d2 - 113);
+fail:
+        return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        int rf_locked, ref_locked;
+        s32 rf_input_level;
+        int ret;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = mxl5007t_synth_lock_status(state, &rf_locked, &ref_locked);
+        if (mxl_fail(ret))
+                goto fail;
+        mxl_debug("%s%s", rf_locked ? "rf locked " : "",
+                  ref_locked ? "ref locked" : "");
+
+        ret = mxl5007t_check_rf_input_power(state, &rf_input_level);
+        if (mxl_fail(ret))
+                goto fail;
+        mxl_debug("rf input power: %d", rf_input_level);
+fail:
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_set_params(struct dvb_frontend *fe,
+                               struct dvb_frontend_parameters *params)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        enum mxl5007t_bw_mhz bw;
+        enum mxl5007t_mode mode;
+        int ret;
+        u32 freq = params->frequency;
+
+        if (fe->ops.info.type == FE_ATSC) {
+                switch (params->u.vsb.modulation) {
+                case VSB_8:
+                case VSB_16:
+                        mode = MxL_MODE_OTA_DVBT_ATSC;
+                        break;
+                case QAM_64:
+                case QAM_256:
+                        mode = MxL_MODE_CABLE_DIGITAL;
+                        break;
+                default:
+                        mxl_err("modulation not set!");
+                        return -EINVAL;
+                }
+                bw = MxL_BW_6MHz;
+        } else if (fe->ops.info.type == FE_OFDM) {
+                switch (params->u.ofdm.bandwidth) {
+                case BANDWIDTH_6_MHZ:
+                        bw = MxL_BW_6MHz;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        bw = MxL_BW_7MHz;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        bw = MxL_BW_8MHz;
+                        break;
+                default:
+                        mxl_err("bandwidth not set!");
+                        return -EINVAL;
+                }
+                mode = MxL_MODE_OTA_DVBT_ATSC;
+        } else {
+                mxl_err("modulation type not supported!");
+                return -EINVAL;
+        }
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        mutex_lock(&state->lock);
+
+        ret = mxl5007t_tuner_init(state, mode);
+        if (mxl_fail(ret))
+                goto fail;
+
+        ret = mxl5007t_tuner_rf_tune(state, freq, bw);
+        if (mxl_fail(ret))
+                goto fail;
+
+        state->frequency = freq;
+        state->bandwidth = (fe->ops.info.type == FE_OFDM) ?
+                params->u.ofdm.bandwidth : 0;
+fail:
+        mutex_unlock(&state->lock);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+static int mxl5007t_set_analog_params(struct dvb_frontend *fe,
+                                      struct analog_parameters *params)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        enum mxl5007t_bw_mhz bw = 0; /* FIXME */
+        enum mxl5007t_mode cbl_mode;
+        enum mxl5007t_mode ota_mode;
+        char *mode_name;
+        int ret;
+        u32 freq = params->frequency * 62500;
+
+#define cable 1
+        if (params->std & V4L2_STD_MN) {
+                cbl_mode = MxL_MODE_CABLE_NTSC_PAL_GH;
+                ota_mode = MxL_MODE_OTA_NTSC_PAL_GH;
+                mode_name = "MN";
+        } else if (params->std & V4L2_STD_B) {
+                cbl_mode = MxL_MODE_CABLE_PAL_IB;
+                ota_mode = MxL_MODE_OTA_PAL_IB;
+                mode_name = "B";
+        } else if (params->std & V4L2_STD_GH) {
+                cbl_mode = MxL_MODE_CABLE_NTSC_PAL_GH;
+                ota_mode = MxL_MODE_OTA_NTSC_PAL_GH;
+                mode_name = "GH";
+        } else if (params->std & V4L2_STD_PAL_I) {
+                cbl_mode = MxL_MODE_CABLE_PAL_IB;
+                ota_mode = MxL_MODE_OTA_PAL_IB;
+                mode_name = "I";
+        } else if (params->std & V4L2_STD_DK) {
+                cbl_mode = MxL_MODE_CABLE_PAL_D_SECAM_KL;
+                ota_mode = MxL_MODE_OTA_PAL_D_SECAM_KL;
+                mode_name = "DK";
+        } else if (params->std & V4L2_STD_SECAM_L) {
+                cbl_mode = MxL_MODE_CABLE_PAL_D_SECAM_KL;
+                ota_mode = MxL_MODE_OTA_PAL_D_SECAM_KL;
+                mode_name = "L";
+        } else if (params->std & V4L2_STD_SECAM_LC) {
+                cbl_mode = MxL_MODE_CABLE_PAL_D_SECAM_KL;
+                ota_mode = MxL_MODE_OTA_PAL_D_SECAM_KL;
+                mode_name = "L'";
+        } else {
+                mode_name = "xx";
+                /* FIXME */
+                cbl_mode = MxL_MODE_CABLE_NTSC_PAL_GH;
+                ota_mode = MxL_MODE_OTA_NTSC_PAL_GH;
+        }
+        mxl_debug("setting mxl5007 to system %s", mode_name);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        mutex_lock(&state->lock);
+
+        ret = mxl5007t_tuner_init(state, cable ? cbl_mode : ota_mode);
+        if (mxl_fail(ret))
+                goto fail;
+
+        ret = mxl5007t_tuner_rf_tune(state, freq, bw);
+        if (mxl_fail(ret))
+                goto fail;
+
+        state->frequency = freq;
+        state->bandwidth = 0;
+fail:
+        mutex_unlock(&state->lock);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_init(struct dvb_frontend *fe)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        int ret;
+        u8 d;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = mxl5007t_read_reg(state, 0x05, &d);
+        if (mxl_fail(ret))
+                goto fail;
+
+        ret = mxl5007t_write_reg(state, 0x05, d | 0x01);
+        mxl_fail(ret);
+fail:
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+static int mxl5007t_sleep(struct dvb_frontend *fe)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        int ret;
+        u8 d;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = mxl5007t_read_reg(state, 0x05, &d);
+        if (mxl_fail(ret))
+                goto fail;
+
+        ret = mxl5007t_write_reg(state, 0x05, d & ~0x01);
+        mxl_fail(ret);
+fail:
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static int mxl5007t_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        *frequency = state->frequency;
+        return 0;
+}
+
+static int mxl5007t_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+        *bandwidth = state->bandwidth;
+        return 0;
+}
+
+static int mxl5007t_release(struct dvb_frontend *fe)
+{
+        struct mxl5007t_state *state = fe->tuner_priv;
+
+        mutex_lock(&mxl5007t_list_mutex);
+
+        if (state)
+                hybrid_tuner_release_state(state);
+
+        mutex_unlock(&mxl5007t_list_mutex);
+
+        fe->tuner_priv = NULL;
+
+        return 0;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static struct dvb_tuner_ops mxl5007t_tuner_ops = {
+        .info = {
+                .name = "MaxLinear MxL5007T",
+        },
+        .init              = mxl5007t_init,
+        .sleep             = mxl5007t_sleep,
+        .set_params        = mxl5007t_set_params,
+        .set_analog_params = mxl5007t_set_analog_params,
+        .get_status        = mxl5007t_get_status,
+        .get_frequency     = mxl5007t_get_frequency,
+        .get_bandwidth     = mxl5007t_get_bandwidth,
+        .release           = mxl5007t_release,
+};
+
+static int mxl5007t_get_chip_id(struct mxl5007t_state *state)
+{
+        char *name;
+        int ret;
+        u8 id;
+
+        ret = mxl5007t_read_reg(state, 0xd3, &id);
+        if (mxl_fail(ret))
+                goto fail;
+
+        switch (id) {
+        case MxL_5007_V1_F1:
+                name = "MxL5007.v1.f1";
+                break;
+        case MxL_5007_V1_F2:
+                name = "MxL5007.v1.f2";
+                break;
+        case MxL_5007_V2_100_F1:
+                name = "MxL5007.v2.100.f1";
+                break;
+        case MxL_5007_V2_100_F2:
+                name = "MxL5007.v2.100.f2";
+                break;
+        case MxL_5007_V2_200_F1:
+                name = "MxL5007.v2.200.f1";
+                break;
+        case MxL_5007_V2_200_F2:
+                name = "MxL5007.v2.200.f2";
+                break;
+        default:
+                name = "MxL5007T";
+                id = MxL_UNKNOWN_ID;
+        }
+        state->chip_id = id;
+        mxl_info("%s detected @ %d-%04x", name,
+                 i2c_adapter_id(state->i2c_props.adap),
+                 state->i2c_props.addr);
+        return 0;
+fail:
+        mxl_warn("unable to identify device @ %d-%04x",
+                 i2c_adapter_id(state->i2c_props.adap),
+                 state->i2c_props.addr);
+
+        state->chip_id = MxL_UNKNOWN_ID;
+        return ret;
+}
+
+struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
+                                     struct i2c_adapter *i2c, u8 addr,
+                                     struct mxl5007t_config *cfg)
+{
+        struct mxl5007t_state *state = NULL;
+        int instance, ret;
+
+        mutex_lock(&mxl5007t_list_mutex);
+        instance = hybrid_tuner_request_state(struct mxl5007t_state, state,
+                                              hybrid_tuner_instance_list,
+                                              i2c, addr, "mxl5007");
+        switch (instance) {
+        case 0:
+                goto fail;
+                break;
+        case 1:
+                /* new tuner instance */
+                state->config = cfg;
+
+                mutex_init(&state->lock);
+
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                ret = mxl5007t_get_chip_id(state);
+
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+
+                /* check return value of mxl5007t_get_chip_id */
+                if (mxl_fail(ret))
+                        goto fail;
+                break;
+        default:
+                /* existing tuner instance */
+                break;
+        }
+        fe->tuner_priv = state;
+        mutex_unlock(&mxl5007t_list_mutex);
+
+        memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops,
+               sizeof(struct dvb_tuner_ops));
+
+        return fe;
+fail:
+        mutex_unlock(&mxl5007t_list_mutex);
+
+        mxl5007t_release(fe);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(mxl5007t_attach);
+MODULE_DESCRIPTION("MaxLinear MxL5007T Silicon IC tuner driver");
+MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("0.1");
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/common/tuners/mxl5007t.h b/drivers/media/common/tuners/mxl5007t.h
new file mode 100644
index 000000000000..aa3eea0b5262
--- /dev/null
+++ b/drivers/media/common/tuners/mxl5007t.h
@@ -0,0 +1,104 @@
+/*
+ *  mxl5007t.h - driver for the MaxLinear MxL5007T silicon tuner
+ *
+ *  Copyright (C) 2008 Michael Krufky <mkrufky@linuxtv.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __MXL5007T_H__
+#define __MXL5007T_H__
+
+#include "dvb_frontend.h"
+
+/* ------------------------------------------------------------------------- */
+
+enum mxl5007t_if_freq {
+        MxL_IF_4_MHZ,      /*  4000000 */
+        MxL_IF_4_5_MHZ,    /*  4500000 */
+        MxL_IF_4_57_MHZ,   /*  4570000 */
+        MxL_IF_5_MHZ,      /*  5000000 */
+        MxL_IF_5_38_MHZ,   /*  5380000 */
+        MxL_IF_6_MHZ,      /*  6000000 */
+        MxL_IF_6_28_MHZ,   /*  6280000 */
+        MxL_IF_9_1915_MHZ, /*  9191500 */
+        MxL_IF_35_25_MHZ,  /* 35250000 */
+        MxL_IF_36_15_MHZ,  /* 36150000 */
+        MxL_IF_44_MHZ,     /* 44000000 */
+};
+
+enum mxl5007t_xtal_freq {
+        MxL_XTAL_16_MHZ,      /* 16000000 */
+        MxL_XTAL_20_MHZ,      /* 20000000 */
+        MxL_XTAL_20_25_MHZ,   /* 20250000 */
+        MxL_XTAL_20_48_MHZ,   /* 20480000 */
+        MxL_XTAL_24_MHZ,      /* 24000000 */
+        MxL_XTAL_25_MHZ,      /* 25000000 */
+        MxL_XTAL_25_14_MHZ,   /* 25140000 */
+        MxL_XTAL_27_MHZ,      /* 27000000 */
+        MxL_XTAL_28_8_MHZ,    /* 28800000 */
+        MxL_XTAL_32_MHZ,      /* 32000000 */
+        MxL_XTAL_40_MHZ,      /* 40000000 */
+        MxL_XTAL_44_MHZ,      /* 44000000 */
+        MxL_XTAL_48_MHZ,      /* 48000000 */
+        MxL_XTAL_49_3811_MHZ, /* 49381100 */
+};
+
+enum mxl5007t_clkout_amp {
+        MxL_CLKOUT_AMP_0_94V = 0,
+        MxL_CLKOUT_AMP_0_53V = 1,
+        MxL_CLKOUT_AMP_0_37V = 2,
+        MxL_CLKOUT_AMP_0_28V = 3,
+        MxL_CLKOUT_AMP_0_23V = 4,
+        MxL_CLKOUT_AMP_0_20V = 5,
+        MxL_CLKOUT_AMP_0_17V = 6,
+        MxL_CLKOUT_AMP_0_15V = 7,
+};
+
+struct mxl5007t_config {
+        s32 if_diff_out_level;
+        enum mxl5007t_clkout_amp clk_out_amp;
+        enum mxl5007t_xtal_freq xtal_freq_hz;
+        enum mxl5007t_if_freq if_freq_hz;
+        unsigned int invert_if:1;
+        unsigned int loop_thru_enable:1;
+        unsigned int clk_out_enable:1;
+};
+
+#if defined(CONFIG_MEDIA_TUNER_MXL5007T) || (defined(CONFIG_MEDIA_TUNER_MXL5007T_MODULE) && defined(MODULE))
+extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
+                                            struct i2c_adapter *i2c, u8 addr,
+                                            struct mxl5007t_config *cfg);
+#else
+static inline struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
+                                                   struct i2c_adapter *i2c,
+                                                   u8 addr,
+                                                   struct mxl5007t_config *cfg)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif
+
+#endif /* __MXL5007T_H__ */
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
+
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index a0545ba957b0..72abf0b73486 100644
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -6,7 +6,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include "tuner-i2c.h"
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 266c255cf0d8..597e47f5d69c 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -6,7 +6,7 @@
  */
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include <media/tuner-types.h>
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 7588db1319d0..7e9c090fc04e 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,7 +1,6 @@
 config DVB_BT8XX
         tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_BT848
-        depends on HOTPLUG      # due to FW_LOADER
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_SP887X if !DVB_FE_CUSTOMISE
         select DVB_NXT6000 if !DVB_FE_CUSTOMISE
@@ -10,7 +9,6 @@ config DVB_BT8XX
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
           the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index a577c0f89f67..e84152b7576d 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -1,8 +1,6 @@
 config DVB_USB
         tristate "Support for various USB DVB devices"
         depends on DVB_CORE && USB && I2C && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
-        select FW_LOADER
         help
           By enabling this you will be able to choose the various supported
           USB1.1 and USB2.0 DVB devices.
@@ -246,6 +244,14 @@ config DVB_USB_AF9005_REMOTE
           Say Y here to support the default remote control decoding for the
           Afatech AF9005 based receiver.
 
+config DVB_USB_DW2102
+        tristate "DvbWorld 2102 DVB-S USB2.0 receiver"
+        depends on DVB_USB
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_PLL if !DVB_FE_CUSTOMISE
+        help
+           Say Y here to support the DvbWorld 2102 DVB-S USB2.0 receiver.
+
 config DVB_USB_ANYSEE
         tristate "Anysee DVB-T/C USB2.0 support"
         depends on DVB_USB
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 44c11e45e564..e206f1ea0027 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -64,6 +64,9 @@ obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
 dvb-usb-anysee-objs = anysee.o
 obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o
 
+dvb-usb-dw2102-objs = dw2102.o
+obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 # due to tuner-xc3028
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index adfd4fc82efd..2f408d2e1ef3 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -43,7 +43,7 @@ module_param_named(debug, dvb_usb_anysee_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-struct mutex anysee_usb_mutex;
+static struct mutex anysee_usb_mutex;
 
 static int anysee_ctrl_msg(struct dvb_usb_device *d, u8 *sbuf, u8 slen,
         u8 *rbuf, u8 rlen)
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index e5238b31e946..029b437caf9a 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -204,5 +204,6 @@
 #define USB_PID_ASUS_U3000                              0x171f
 #define USB_PID_ASUS_U3100                              0x173f
 #define USB_PID_YUAN_EC372S                             0x1edc
+#define USB_PID_DW2102                                  0x2102
 
 #endif
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
new file mode 100644
index 000000000000..a4d898b44e55
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -0,0 +1,425 @@
+/* DVB USB framework compliant Linux driver for the DVBWorld DVB-S 2102 Card
+*
+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+*
+*       This program is free software; you can redistribute it and/or modify it
+*       under the terms of the GNU General Public License as published by the
+*       Free Software Foundation, version 2.
+*
+* see Documentation/dvb/README.dvb-usb for more information
+*/
+#include <linux/version.h>
+#include "dw2102.h"
+#include "stv0299.h"
+#include "z0194a.h"
+
+#ifndef USB_PID_DW2102
+#define USB_PID_DW2102 0x2102
+#endif
+
+#define DW2102_READ_MSG 0
+#define DW2102_WRITE_MSG 1
+
+#define REG_1F_SYMBOLRATE_BYTE0 0x1f
+#define REG_20_SYMBOLRATE_BYTE1 0x20
+#define REG_21_SYMBOLRATE_BYTE2 0x21
+
+#define DW2102_VOLTAGE_CTRL (0x1800)
+#define DW2102_RC_QUERY (0x1a00)
+
+struct dw2102_state {
+        u32 last_key_pressed;
+};
+struct dw2102_rc_keys {
+        u32 keycode;
+        u32 event;
+};
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static int dw2102_op_rw(struct usb_device *dev, u8 request, u16 value,
+                u8 *data, u16 len, int flags)
+{
+        int ret;
+        u8 u8buf[len];
+
+        unsigned int pipe = (flags == DW2102_READ_MSG) ?
+                usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0);
+        u8 request_type = (flags == DW2102_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT;
+
+        if (flags == DW2102_WRITE_MSG)
+                memcpy(u8buf, data, len);
+        ret = usb_control_msg(dev, pipe, request,
+                request_type | USB_TYPE_VENDOR, value, 0 , u8buf, len, 2000);
+
+        if (flags == DW2102_READ_MSG)
+                memcpy(data, u8buf, len);
+        return ret;
+}
+
+/* I2C */
+
+static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                int num)
+{
+struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i = 0, ret = 0;
+        u8 buf6[] = {0x2c, 0x05, 0xc0, 0, 0, 0, 0};
+        u8 request;
+        u16 value;
+
+        if (!d)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        switch (num) {
+        case 2:
+                /* read stv0299 register */
+                request = 0xb5;
+                value = msg[0].buf[0];/* register */
+                for (i = 0; i < msg[1].len; i++) {
+                        value = value + i;
+                        ret = dw2102_op_rw(d->udev, 0xb5,
+                                value, buf6, 2, DW2102_READ_MSG);
+                        msg[1].buf[i] = buf6[0];
+
+                }
+                break;
+        case 1:
+                switch (msg[0].addr) {
+                case 0x68:
+                        /* write to stv0299 register */
+                        buf6[0] = 0x2a;
+                        buf6[1] = msg[0].buf[0];
+                        buf6[2] = msg[0].buf[1];
+                        ret = dw2102_op_rw(d->udev, 0xb2,
+                                0, buf6, 3, DW2102_WRITE_MSG);
+                        break;
+                case 0x60:
+                        if (msg[0].flags == 0) {
+                        /* write to tuner pll */
+                                buf6[0] = 0x2c;
+                                buf6[1] = 5;
+                                buf6[2] = 0xc0;
+                                buf6[3] = msg[0].buf[0];
+                                buf6[4] = msg[0].buf[1];
+                                buf6[5] = msg[0].buf[2];
+                                buf6[6] = msg[0].buf[3];
+                                ret = dw2102_op_rw(d->udev, 0xb2,
+                                0, buf6, 7, DW2102_WRITE_MSG);
+                        } else {
+                        /* write to tuner pll */
+                                ret = dw2102_op_rw(d->udev, 0xb5,
+                                0, buf6, 1, DW2102_READ_MSG);
+                                msg[0].buf[0] = buf6[0];
+                        }
+                        break;
+                case (DW2102_RC_QUERY):
+                        ret  = dw2102_op_rw(d->udev, 0xb8,
+                                0, buf6, 2, DW2102_READ_MSG);
+                        msg[0].buf[0] = buf6[0];
+                        msg[0].buf[1] = buf6[1];
+                        break;
+                case (DW2102_VOLTAGE_CTRL):
+                        buf6[0] = 0x30;
+                        buf6[1] = msg[0].buf[0];
+                        ret = dw2102_op_rw(d->udev, 0xb2,
+                                0, buf6, 2, DW2102_WRITE_MSG);
+                        break;
+                }
+
+                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return num;
+}
+
+static u32 dw2102_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm dw2102_i2c_algo = {
+        .master_xfer = dw2102_i2c_transfer,
+        .functionality = dw2102_i2c_func,
+};
+
+static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+        static u8 command_13v[1] = {0x00};
+        static u8 command_18v[1] = {0x01};
+        struct i2c_msg msg[] = {
+                {.addr = DW2102_VOLTAGE_CTRL, .flags = 0,
+                        .buf = command_13v, .len = 1},
+        };
+
+        struct dvb_usb_adapter *udev_adap =
+                (struct dvb_usb_adapter *)(fe->dvb->priv);
+        if (voltage == SEC_VOLTAGE_18)
+                msg[0].buf = command_18v;
+        i2c_transfer(&udev_adap->dev->i2c_adap, msg, 1);
+        return 0;
+}
+
+static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
+{
+        d->fe = dvb_attach(stv0299_attach, &sharp_z0194a_config,
+                &d->dev->i2c_adap);
+        if (d->fe != NULL) {
+                d->fe->ops.set_voltage = dw2102_set_voltage;
+                info("Attached stv0299!\n");
+                return 0;
+        }
+        return -EIO;
+}
+
+static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        dvb_attach(dvb_pll_attach, adap->fe, 0x60,
+                &adap->dev->i2c_adap, DVB_PLL_OPERA1);
+        return 0;
+}
+
+static struct dvb_usb_rc_key dw2102_rc_keys[] = {
+        { 0xf8, 0x0a, KEY_Q },          /*power*/
+        { 0xf8, 0x0c, KEY_M },          /*mute*/
+        { 0xf8, 0x11, KEY_1 },
+        { 0xf8, 0x12, KEY_2 },
+        { 0xf8, 0x13, KEY_3 },
+        { 0xf8, 0x14, KEY_4 },
+        { 0xf8, 0x15, KEY_5 },
+        { 0xf8, 0x16, KEY_6 },
+        { 0xf8, 0x17, KEY_7 },
+        { 0xf8, 0x18, KEY_8 },
+        { 0xf8, 0x19, KEY_9 },
+        { 0xf8, 0x10, KEY_0 },
+        { 0xf8, 0x1c, KEY_PAGEUP },     /*ch+*/
+        { 0xf8, 0x0f, KEY_PAGEDOWN },   /*ch-*/
+        { 0xf8, 0x1a, KEY_O },          /*vol+*/
+        { 0xf8, 0x0e, KEY_Z },          /*vol-*/
+        { 0xf8, 0x04, KEY_R },          /*rec*/
+        { 0xf8, 0x09, KEY_D },          /*fav*/
+        { 0xf8, 0x08, KEY_BACKSPACE },  /*rewind*/
+        { 0xf8, 0x07, KEY_A },          /*fast*/
+        { 0xf8, 0x0b, KEY_P },          /*pause*/
+        { 0xf8, 0x02, KEY_ESC },        /*cancel*/
+        { 0xf8, 0x03, KEY_G },          /*tab*/
+        { 0xf8, 0x00, KEY_UP },         /*up*/
+        { 0xf8, 0x1f, KEY_ENTER },      /*ok*/
+        { 0xf8, 0x01, KEY_DOWN },       /*down*/
+        { 0xf8, 0x05, KEY_C },          /*cap*/
+        { 0xf8, 0x06, KEY_S },          /*stop*/
+        { 0xf8, 0x40, KEY_F },          /*full*/
+        { 0xf8, 0x1e, KEY_W },          /*tvmode*/
+        { 0xf8, 0x1b, KEY_B },          /*recall*/
+
+};
+
+
+
+static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        struct dw2102_state *st = d->priv;
+        u8 key[2];
+        struct i2c_msg msg[] = {
+                {.addr = DW2102_RC_QUERY, .flags = I2C_M_RD, .buf = key,
+                .len = 2},
+        };
+        int i;
+
+        *state = REMOTE_NO_KEY_PRESSED;
+        if (dw2102_i2c_transfer(&d->i2c_adap, msg, 1) == 1) {
+                for (i = 0; i < ARRAY_SIZE(dw2102_rc_keys); i++) {
+                        if (dw2102_rc_keys[i].data == msg[0].buf[0]) {
+                                *state = REMOTE_KEY_PRESSED;
+                                *event = dw2102_rc_keys[i].event;
+                                st->last_key_pressed =
+                                        dw2102_rc_keys[i].event;
+                                break;
+                        }
+                st->last_key_pressed = 0;
+                }
+        }
+        /* info("key: %x %x\n",key[0],key[1]); */
+        return 0;
+}
+
+static struct usb_device_id dw2102_table[] = {
+        {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},
+        {USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
+        { }
+};
+
+MODULE_DEVICE_TABLE(usb, dw2102_table);
+
+static int dw2102_load_firmware(struct usb_device *dev,
+                        const struct firmware *frmwr)
+{
+        u8 *b, *p;
+        int ret = 0, i;
+        u8 reset;
+        u8 reset16 [] = {0, 0, 0, 0, 0, 0, 0};
+        const struct firmware *fw;
+        const char *filename = "dvb-usb-dw2101.fw";
+        switch (dev->descriptor.idProduct) {
+        case 0x2101:
+                ret = request_firmware(&fw, filename, &dev->dev);
+                if (ret != 0) {
+                        err("did not find the firmware file. (%s) "
+                        "Please see linux/Documentation/dvb/ for more details "
+                        "on firmware-problems.", filename);
+                        return ret;
+                }
+                break;
+        case USB_PID_DW2102:
+                fw = frmwr;
+                break;
+        }
+        info("start downloading DW2102 firmware");
+        p = kmalloc(fw->size, GFP_KERNEL);
+        reset = 1;
+        /*stop the CPU*/
+        dw2102_op_rw(dev, 0xa0, 0x7f92, &reset, 1, DW2102_WRITE_MSG);
+        dw2102_op_rw(dev, 0xa0, 0xe600, &reset, 1, DW2102_WRITE_MSG);
+
+        if (p != NULL) {
+                memcpy(p, fw->data, fw->size);
+                for (i = 0; i < fw->size; i += 0x40) {
+                        b = (u8 *) p + i;
+                        if (dw2102_op_rw
+                                (dev, 0xa0, i, b , 0x40,
+                                        DW2102_WRITE_MSG) != 0x40
+                                ) {
+                                err("error while transferring firmware");
+                                ret = -EINVAL;
+                                break;
+                        }
+                }
+                /* restart the CPU */
+                reset = 0;
+                if (ret || dw2102_op_rw
+                        (dev, 0xa0, 0x7f92, &reset, 1,
+                        DW2102_WRITE_MSG) != 1) {
+                        err("could not restart the USB controller CPU.");
+                        ret = -EINVAL;
+                }
+                if (ret || dw2102_op_rw
+                        (dev, 0xa0, 0xe600, &reset, 1,
+                        DW2102_WRITE_MSG) != 1) {
+                        err("could not restart the USB controller CPU.");
+                        ret = -EINVAL;
+                }
+                /* init registers */
+                switch (dev->descriptor.idProduct) {
+                case USB_PID_DW2102:
+                        dw2102_op_rw
+                                (dev, 0xbf, 0x0040, &reset, 0,
+                                DW2102_WRITE_MSG);
+                        dw2102_op_rw
+                                (dev, 0xb9, 0x0000, &reset16[0], 2,
+                                DW2102_READ_MSG);
+                        break;
+                case 0x2101:
+                        dw2102_op_rw
+                                (dev, 0xbc, 0x0030, &reset16[0], 2,
+                                DW2102_READ_MSG);
+                        dw2102_op_rw
+                                (dev, 0xba, 0x0000, &reset16[0], 7,
+                                DW2102_READ_MSG);
+                        dw2102_op_rw
+                                (dev, 0xba, 0x0000, &reset16[0], 7,
+                                DW2102_READ_MSG);
+                        dw2102_op_rw
+                                (dev, 0xb9, 0x0000, &reset16[0], 2,
+                                DW2102_READ_MSG);
+                        break;
+                }
+                kfree(p);
+        }
+        return ret;
+}
+
+static struct dvb_usb_device_properties dw2102_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-dw2102.fw",
+        .size_of_priv = sizeof(struct dw2102_state),
+        .no_reconnect = 1,
+
+        .i2c_algo = &dw2102_i2c_algo,
+        .rc_key_map = dw2102_rc_keys,
+        .rc_key_map_size = ARRAY_SIZE(dw2102_rc_keys),
+        .rc_interval = 150,
+        .rc_query = dw2102_rc_query,
+
+        .generic_bulk_ctrl_endpoint = 0x81,
+        /* parameter for the MPEG2-data transfer */
+        .num_adapters = 1,
+        .download_firmware = dw2102_load_firmware,
+        .adapter = {
+                {
+                        .frontend_attach = dw2102_frontend_attach,
+                        .streaming_ctrl = NULL,
+                        .tuner_attach = dw2102_tuner_attach,
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 8,
+                                .endpoint = 0x82,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 4096,
+                                        }
+                                }
+                        },
+                }
+        },
+        .num_device_descs = 2,
+        .devices = {
+                {"DVBWorld DVB-S 2102 USB2.0",
+                        {&dw2102_table[0], NULL},
+                        {NULL},
+                },
+                {"DVBWorld DVB-S 2101 USB2.0",
+                        {&dw2102_table[1], NULL},
+                        {NULL},
+                },
+        }
+};
+
+static int dw2102_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf, &dw2102_properties,
+                THIS_MODULE, NULL, adapter_nr);
+}
+
+static struct usb_driver dw2102_driver = {
+        .name = "dw2102",
+        .probe = dw2102_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table = dw2102_table,
+};
+
+static int __init dw2102_module_init(void)
+{
+        int ret =  usb_register(&dw2102_driver);
+        if (ret)
+                err("usb_register failed. Error number %d", ret);
+
+        return ret;
+}
+
+static void __exit dw2102_module_exit(void)
+{
+        usb_deregister(&dw2102_driver);
+}
+
+module_init(dw2102_module_init);
+module_exit(dw2102_module_exit);
+
+MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
+MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101 2102 USB2.0 device");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dw2102.h b/drivers/media/dvb/dvb-usb/dw2102.h
new file mode 100644
index 000000000000..7a310f906837
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dw2102.h
@@ -0,0 +1,9 @@
+#ifndef _DW2102_H_
+#define _DW2102_H_
+
+#define DVB_USB_LOG_PREFIX "dw2102"
+#include "dvb-usb.h"
+
+extern int dvb_usb_dw2102_debug;
+#define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args)
+#endif
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index c20553c4da1f..574dffe91b68 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -97,9 +97,8 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
         tristate "Spase sp8870 based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
@@ -110,9 +109,8 @@ config DVB_SP8870
 
 config DVB_SP887X
         tristate "Spase sp887x based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
@@ -135,6 +133,20 @@ config DVB_CX22702
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
+config DVB_DRX397XD
+        tristate "Micronas DRX3975D/DRX3977D based"
+        depends on DVB_CORE && I2C && HOTPLUG
+        default m if DVB_FE_CUSTOMISE
+        select FW_LOADER
+        help
+          A DVB-T tuner module. Say Y when you want to support this frontend.
+
+          TODO:
+          This driver needs external firmware. Please use the command
+          "<kerneldir>/Documentation/dvb/get_dvb_firmware drx397xD" to
+          download/extract them, and then copy them to /usr/lib/hotplug/firmware
+          or /lib/firmware (depending on configuration of firmware hotplug).
+
 config DVB_L64781
         tristate "LSI L64781"
         depends on DVB_CORE && I2C
@@ -144,9 +156,8 @@ config DVB_L64781
 
 config DVB_TDA1004X
         tristate "Philips TDA10045H/TDA10046H based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
@@ -211,9 +222,8 @@ config DVB_DIB7000P
 
 config DVB_TDA10048
         tristate "Philips TDA10048HN based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
@@ -253,9 +263,8 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
         tristate "NxtWave Communications NXT2002/NXT2004 based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
           to support this frontend.
@@ -268,9 +277,8 @@ config DVB_NXT200X
 
 config DVB_OR51211
         tristate "Oren OR51211 based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
@@ -281,9 +289,8 @@ config DVB_OR51211
 
 config DVB_OR51132
         tristate "Oren OR51132 based"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
           to support this frontend.
@@ -297,9 +304,8 @@ config DVB_OR51132
 
 config DVB_BCM3510
         tristate "Broadcom BCM3510"
-        depends on DVB_CORE && I2C && HOTPLUG
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
           support this frontend.
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index a89dc0fc4c6f..028da55611c0 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_DVB_NXT6000) += nxt6000.o
 obj-$(CONFIG_DVB_MT352) += mt352.o
 obj-$(CONFIG_DVB_ZL10353) += zl10353.o
 obj-$(CONFIG_DVB_CX22702) += cx22702.o
+obj-$(CONFIG_DVB_DRX397XD) += drx397xD.o
 obj-$(CONFIG_DVB_TDA10021) += tda10021.o
 obj-$(CONFIG_DVB_TDA10023) += tda10023.o
 obj-$(CONFIG_DVB_STV0297) += stv0297.o
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
new file mode 100644
index 000000000000..3cbed874a6f8
--- /dev/null
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -0,0 +1,1504 @@
+/*
+ * Driver for Micronas drx397xD demodulator
+ *
+ * Copyright (C) 2007 Henk Vergonet <Henk.Vergonet@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DEBUG                   /* uncomment if you want debugging output */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/firmware.h>
+#include <asm/div64.h>
+
+#include "dvb_frontend.h"
+#include "drx397xD.h"
+
+static const char mod_name[] = "drx397xD";
+
+#define MAX_CLOCK_DRIFT         200     /* maximal 200 PPM allowed */
+
+#define F_SET_0D0h      1
+#define F_SET_0D4h      2
+
+typedef enum fw_ix {
+#define _FW_ENTRY(a, b)         b
+#include "drx397xD_fw.h"
+} fw_ix_t;
+
+/* chip specifics */
+struct drx397xD_state {
+        struct i2c_adapter *i2c;
+        struct dvb_frontend frontend;
+        struct drx397xD_config config;
+        fw_ix_t chip_rev;
+        int flags;
+        u32 bandwidth_parm;     /* internal bandwidth conversions */
+        u32 f_osc;              /* w90: actual osc frequency [Hz] */
+};
+
+/*******************************************************************************
+ * Firmware
+ ******************************************************************************/
+
+static const char *blob_name[] = {
+#define _BLOB_ENTRY(a, b)               a
+#include "drx397xD_fw.h"
+};
+
+typedef enum blob_ix {
+#define _BLOB_ENTRY(a, b)               b
+#include "drx397xD_fw.h"
+} blob_ix_t;
+
+static struct {
+        const char *name;
+        const struct firmware *file;
+        rwlock_t lock;
+        int refcnt;
+        const u8 *data[ARRAY_SIZE(blob_name)];
+} fw[] = {
+#define _FW_ENTRY(a, b)         {                       \
+                        .name   = a,                    \
+                        .file   = 0,                    \
+                        .lock   = RW_LOCK_UNLOCKED,     \
+                        .refcnt = 0,                    \
+                        .data   = { }           }
+#include "drx397xD_fw.h"
+};
+
+/* use only with writer lock aquired */
+static void _drx_release_fw(struct drx397xD_state *s, fw_ix_t ix)
+{
+        memset(&fw[ix].data[0], 0, sizeof(fw[0].data));
+        if (fw[ix].file)
+                release_firmware(fw[ix].file);
+}
+
+static void drx_release_fw(struct drx397xD_state *s)
+{
+        fw_ix_t ix = s->chip_rev;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        write_lock(&fw[ix].lock);
+        if (fw[ix].refcnt) {
+                fw[ix].refcnt--;
+                if (fw[ix].refcnt == 0)
+                        _drx_release_fw(s, ix);
+        }
+        write_unlock(&fw[ix].lock);
+}
+
+static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
+{
+        const u8 *data;
+        size_t size, len;
+        int i = 0, j, rc = -EINVAL;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        if (ix < 0 || ix >= ARRAY_SIZE(fw))
+                return -EINVAL;
+        s->chip_rev = ix;
+
+        write_lock(&fw[ix].lock);
+        if (fw[ix].file) {
+                rc = 0;
+                goto exit_ok;
+        }
+        memset(&fw[ix].data[0], 0, sizeof(fw[0].data));
+
+        if (request_firmware(&fw[ix].file, fw[ix].name, &s->i2c->dev) != 0) {
+                printk(KERN_ERR "%s: Firmware \"%s\" not available\n",
+                       mod_name, fw[ix].name);
+                rc = -ENOENT;
+                goto exit_err;
+        }
+
+        if (!fw[ix].file->data || fw[ix].file->size < 10)
+                goto exit_corrupt;
+
+        data = fw[ix].file->data;
+        size = fw[ix].file->size;
+
+        if (data[i++] != 2)     /* check firmware version */
+                goto exit_corrupt;
+
+        do {
+                switch (data[i++]) {
+                case 0x00:      /* bytecode */
+                        if (i >= size)
+                                break;
+                        i += data[i];
+                case 0x01:      /* reset */
+                case 0x02:      /* sleep */
+                        i++;
+                        break;
+                case 0xfe:      /* name */
+                        len = strnlen(&data[i], size - i);
+                        if (i + len + 1 >= size)
+                                goto exit_corrupt;
+                        if (data[i + len + 1] != 0)
+                                goto exit_corrupt;
+                        for (j = 0; j < ARRAY_SIZE(blob_name); j++) {
+                                if (strcmp(blob_name[j], &data[i]) == 0) {
+                                        fw[ix].data[j] = &data[i + len + 1];
+                                        pr_debug("Loading %s\n", blob_name[j]);
+                                }
+                        }
+                        i += len + 1;
+                        break;
+                case 0xff:      /* file terminator */
+                        if (i == size) {
+                                rc = 0;
+                                goto exit_ok;
+                        }
+                default:
+                        goto exit_corrupt;
+                }
+        } while (i < size);
+      exit_corrupt:
+        printk(KERN_ERR "%s: Firmware is corrupt\n", mod_name);
+      exit_err:
+        _drx_release_fw(s, ix);
+        fw[ix].refcnt--;
+      exit_ok:
+        fw[ix].refcnt++;
+        write_unlock(&fw[ix].lock);
+        return rc;
+}
+
+/*******************************************************************************
+ * i2c bus IO
+ ******************************************************************************/
+
+static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
+{
+        struct i2c_msg msg = {.addr = s->config.demod_address,.flags = 0 };
+        const u8 *data;
+        int len, rc = 0, i = 0;
+
+        if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) {
+                pr_debug("%s drx_fw_ix_t out of range\n", __FUNCTION__);
+                return -EINVAL;
+        }
+        pr_debug("%s %s\n", __FUNCTION__, blob_name[ix]);
+
+        read_lock(&fw[s->chip_rev].lock);
+        data = fw[s->chip_rev].data[ix];
+        if (!data) {
+                rc = -EINVAL;
+                goto exit_rc;
+        }
+
+        for (;;) {
+                switch (data[i++]) {
+                case 0: /* bytecode */
+                        len = data[i++];
+                        msg.len = len;
+                        msg.buf = (__u8 *) &data[i];
+                        if (i2c_transfer(s->i2c, &msg, 1) != 1) {
+                                rc = -EIO;
+                                goto exit_rc;
+                        }
+                        i += len;
+                        break;
+                case 1: /* reset */
+                case 2: /* sleep */
+                        i++;
+                        break;
+                default:
+                        goto exit_rc;
+                }
+        }
+      exit_rc:
+        read_unlock(&fw[s->chip_rev].lock);
+        return 0;
+}
+
+/* Function is not endian safe, use the RD16 wrapper below */
+static int _read16(struct drx397xD_state *s, u32 i2c_adr)
+{
+        int rc;
+        u8 a[4];
+        u16 v;
+        struct i2c_msg msg[2] = {
+                {
+                 .addr = s->config.demod_address,
+                 .flags = 0,
+                 .buf = a,
+                 .len = sizeof(a)
+                 }
+                , {
+                   .addr = s->config.demod_address,
+                   .flags = I2C_M_RD,
+                   .buf = (u8 *) & v,
+                   .len = sizeof(v)
+                   }
+        };
+
+        *(u32 *) a = i2c_adr;
+
+        rc = i2c_transfer(s->i2c, msg, 2);
+        if (rc != 2)
+                return -EIO;
+
+        return le16_to_cpu(v);
+}
+
+/* Function is not endian safe, use the WR16.. wrappers below */
+static int _write16(struct drx397xD_state *s, u32 i2c_adr, u16 val)
+{
+        u8 a[6];
+        int rc;
+        struct i2c_msg msg = {
+                .addr = s->config.demod_address,
+                .flags = 0,
+                .buf = a,
+                .len = sizeof(a)
+        };
+
+        *(u32 *) a = i2c_adr;
+        *(u16 *) & a[4] = val;
+
+        rc = i2c_transfer(s->i2c, &msg, 1);
+        if (rc != 1)
+                return -EIO;
+        return 0;
+}
+
+#define WR16(ss,adr, val) \
+                _write16(ss, I2C_ADR_C0(adr), cpu_to_le16(val))
+#define WR16_E0(ss,adr, val) \
+                _write16(ss, I2C_ADR_E0(adr), cpu_to_le16(val))
+#define RD16(ss,adr) \
+                _read16(ss, I2C_ADR_C0(adr))
+
+#define EXIT_RC( cmd )  if ( (rc = (cmd)) < 0) goto exit_rc
+
+/*******************************************************************************
+ * Tuner callback
+ ******************************************************************************/
+
+static int PLL_Set(struct drx397xD_state *s,
+                   struct dvb_frontend_parameters *fep, int *df_tuner)
+{
+        struct dvb_frontend *fe = &s->frontend;
+        u32 f_tuner, f = fep->frequency;
+        int rc;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        if ((f > s->frontend.ops.tuner_ops.info.frequency_max) ||
+            (f < s->frontend.ops.tuner_ops.info.frequency_min))
+                return -EINVAL;
+
+        *df_tuner = 0;
+        if (!s->frontend.ops.tuner_ops.set_params ||
+            !s->frontend.ops.tuner_ops.get_frequency)
+                return -ENOSYS;
+
+        rc = s->frontend.ops.tuner_ops.set_params(fe, fep);
+        if (rc < 0)
+                return rc;
+
+        rc = s->frontend.ops.tuner_ops.get_frequency(fe, &f_tuner);
+        if (rc < 0)
+                return rc;
+
+        *df_tuner = f_tuner - f;
+        pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __FUNCTION__, f,
+                 f_tuner);
+
+        return 0;
+}
+
+/*******************************************************************************
+ * Demodulator helper functions
+ ******************************************************************************/
+
+static int SC_WaitForReady(struct drx397xD_state *s)
+{
+        int cnt = 1000;
+        int rc;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        while (cnt--) {
+                rc = RD16(s, 0x820043);
+                if (rc == 0)
+                        return 0;
+        }
+        return -1;
+}
+
+static int SC_SendCommand(struct drx397xD_state *s, int cmd)
+{
+        int rc;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        WR16(s, 0x820043, cmd);
+        SC_WaitForReady(s);
+        rc = RD16(s, 0x820042);
+        if ((rc & 0xffff) == 0xffff)
+                return -1;
+        return 0;
+}
+
+static int HI_Command(struct drx397xD_state *s, u16 cmd)
+{
+        int rc, cnt = 1000;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        rc = WR16(s, 0x420032, cmd);
+        if (rc < 0)
+                return rc;
+
+        do {
+                rc = RD16(s, 0x420032);
+                if (rc == 0) {
+                        rc = RD16(s, 0x420031);
+                        return rc;
+                }
+                if (rc < 0)
+                        return rc;
+        } while (--cnt);
+        return rc;
+}
+
+static int HI_CfgCommand(struct drx397xD_state *s)
+{
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        WR16(s, 0x420033, 0x3973);
+        WR16(s, 0x420034, s->config.w50);       // code 4, log 4
+        WR16(s, 0x420035, s->config.w52);       // code 15,  log 9
+        WR16(s, 0x420036, s->config.demod_address << 1);
+        WR16(s, 0x420037, s->config.w56);       // code (set_i2c ??  initX 1 ), log 1
+//      WR16(s, 0x420033, 0x3973);
+        if ((s->config.w56 & 8) == 0)
+                return HI_Command(s, 3);
+        return WR16(s, 0x420032, 0x3);
+}
+
+static const u8 fastIncrDecLUT_15273[] = {
+        0x0e, 0x0f, 0x0f, 0x10, 0x11, 0x12, 0x12, 0x13, 0x14,
+        0x15, 0x16, 0x17, 0x18, 0x1a, 0x1b, 0x1c, 0x1d, 0x1f
+};
+
+static const u8 slowIncrDecLUT_15272[] = {
+        3, 4, 4, 5, 6
+};
+
+static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)
+{
+        u16 w06 = agc->w06;
+        u16 w08 = agc->w08;
+        u16 w0A = agc->w0A;
+        u16 w0C = agc->w0C;
+        int quot, rem, i, rc = -EINVAL;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        if (agc->w04 > 0x3ff)
+                goto exit_rc;
+
+        if (agc->d00 == 1) {
+                EXIT_RC(RD16(s, 0x0c20010));
+                rc &= ~0x10;
+                EXIT_RC(WR16(s, 0x0c20010, rc));
+                return WR16(s, 0x0c20030, agc->w04 & 0x7ff);
+        }
+
+        if (agc->d00 != 0)
+                goto exit_rc;
+        if (w0A < w08)
+                goto exit_rc;
+        if (w0A > 0x3ff)
+                goto exit_rc;
+        if (w0C > 0x3ff)
+                goto exit_rc;
+        if (w06 > 0x3ff)
+                goto exit_rc;
+
+        EXIT_RC(RD16(s, 0x0c20010));
+        rc |= 0x10;
+        EXIT_RC(WR16(s, 0x0c20010, rc));
+
+        EXIT_RC(WR16(s, 0x0c20025, (w06 >> 1) & 0x1ff));
+        EXIT_RC(WR16(s, 0x0c20031, (w0A - w08) >> 1));
+        EXIT_RC(WR16(s, 0x0c20032, ((w0A + w08) >> 1) - 0x1ff));
+
+        quot = w0C / 113;
+        rem = w0C % 113;
+        if (quot <= 8) {
+                quot = 8 - quot;
+        } else {
+                quot = 0;
+                rem += 113;
+        }
+
+        EXIT_RC(WR16(s, 0x0c20024, quot));
+
+        i = fastIncrDecLUT_15273[rem / 8];
+        EXIT_RC(WR16(s, 0x0c2002d, i));
+        EXIT_RC(WR16(s, 0x0c2002e, i));
+
+        i = slowIncrDecLUT_15272[rem / 28];
+        EXIT_RC(WR16(s, 0x0c2002b, i));
+        rc = WR16(s, 0x0c2002c, i);
+      exit_rc:
+        return rc;
+}
+
+static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)
+{
+        u16 w04 = agc->w04;
+        u16 w06 = agc->w06;
+        int rc = -1;
+
+        pr_debug("%s %d 0x%x 0x%x\n", __FUNCTION__, agc->d00, w04, w06);
+
+        if (w04 > 0x3ff)
+                goto exit_rc;
+
+        switch (agc->d00) {
+        case 1:
+                if (w04 == 0x3ff)
+                        w04 = 0x400;
+
+                EXIT_RC(WR16(s, 0x0c20036, w04));
+                s->config.w9C &= ~2;
+                EXIT_RC(WR16(s, 0x0c20015, s->config.w9C));
+                EXIT_RC(RD16(s, 0x0c20010));
+                rc &= 0xbfdf;
+                EXIT_RC(WR16(s, 0x0c20010, rc));
+                EXIT_RC(RD16(s, 0x0c20013));
+                rc &= ~2;
+                break;
+        case 0:
+                // loc_8000659
+                s->config.w9C &= ~2;
+                EXIT_RC(WR16(s, 0x0c20015, s->config.w9C));
+                EXIT_RC(RD16(s, 0x0c20010));
+                rc &= 0xbfdf;
+                rc |= 0x4000;
+                EXIT_RC(WR16(s, 0x0c20010, rc));
+                EXIT_RC(WR16(s, 0x0c20051, (w06 >> 4) & 0x3f));
+                EXIT_RC(RD16(s, 0x0c20013));
+                rc &= ~2;
+                break;
+        default:
+                s->config.w9C |= 2;
+                EXIT_RC(WR16(s, 0x0c20015, s->config.w9C));
+                EXIT_RC(RD16(s, 0x0c20010));
+                rc &= 0xbfdf;
+                EXIT_RC(WR16(s, 0x0c20010, rc));
+
+                EXIT_RC(WR16(s, 0x0c20036, 0));
+
+                EXIT_RC(RD16(s, 0x0c20013));
+                rc |= 2;
+        }
+        rc = WR16(s, 0x0c20013, rc);
+      exit_rc:
+        return rc;
+}
+
+static int GetLockStatus(struct drx397xD_state *s, int *lockstat)
+{
+        int rc;
+
+        *lockstat = 0;
+
+        rc = RD16(s, 0x082004b);
+        if (rc < 0)
+                return rc;
+
+        if (s->config.d60 != 2)
+                return 0;
+
+        if ((rc & 7) == 7)
+                *lockstat |= 1;
+        if ((rc & 3) == 3)
+                *lockstat |= 2;
+        if (rc & 1)
+                *lockstat |= 4;
+        return 0;
+}
+
+static int CorrectSysClockDeviation(struct drx397xD_state *s)
+{
+        int rc = -EINVAL;
+        int lockstat;
+        u32 clk, clk_limit;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        if (s->config.d5C == 0) {
+                EXIT_RC(WR16(s, 0x08200e8, 0x010));
+                EXIT_RC(WR16(s, 0x08200e9, 0x113));
+                s->config.d5C = 1;
+                return rc;
+        }
+        if (s->config.d5C != 1)
+                goto exit_rc;
+
+        rc = RD16(s, 0x0820048);
+
+        rc = GetLockStatus(s, &lockstat);
+        if (rc < 0)
+                goto exit_rc;
+        if ((lockstat & 1) == 0)
+                goto exit_rc;
+
+        EXIT_RC(WR16(s, 0x0420033, 0x200));
+        EXIT_RC(WR16(s, 0x0420034, 0xc5));
+        EXIT_RC(WR16(s, 0x0420035, 0x10));
+        EXIT_RC(WR16(s, 0x0420036, 0x1));
+        EXIT_RC(WR16(s, 0x0420037, 0xa));
+        EXIT_RC(HI_Command(s, 6));
+        EXIT_RC(RD16(s, 0x0420040));
+        clk = rc;
+        EXIT_RC(RD16(s, 0x0420041));
+        clk |= rc << 16;
+
+        if (clk <= 0x26ffff)
+                goto exit_rc;
+        if (clk > 0x610000)
+                goto exit_rc;
+
+        if (!s->bandwidth_parm)
+                return -EINVAL;
+
+        /* round & convert to Hz */
+        clk = ((u64) (clk + 0x800000) * s->bandwidth_parm + (1 << 20)) >> 21;
+        clk_limit = s->config.f_osc * MAX_CLOCK_DRIFT / 1000;
+
+        if (clk - s->config.f_osc * 1000 + clk_limit <= 2 * clk_limit) {
+                s->f_osc = clk;
+                pr_debug("%s: osc %d %d [Hz]\n", __FUNCTION__,
+                         s->config.f_osc * 1000, clk - s->config.f_osc * 1000);
+        }
+        rc = WR16(s, 0x08200e8, 0);
+      exit_rc:
+        return rc;
+}
+
+static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)
+{
+        int rc, si, bp;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        si = s->config.wA0;
+        if (s->config.w98 == 0) {
+                si |= 1;
+                bp = 0;
+        } else {
+                si &= ~1;
+                bp = 0x200;
+        }
+        if (s->config.w9A == 0) {
+                si |= 0x80;
+        } else {
+                si &= ~0x80;
+        }
+
+        EXIT_RC(WR16(s, 0x2150045, 0));
+        EXIT_RC(WR16(s, 0x2150010, si));
+        EXIT_RC(WR16(s, 0x2150011, bp));
+        rc = WR16(s, 0x2150012, (type == 0 ? 0xfff : 0));
+      exit_rc:
+        return rc;
+}
+
+static int drx_tune(struct drx397xD_state *s,
+                    struct dvb_frontend_parameters *fep)
+{
+        u16 v22 = 0;
+        u16 v1C = 0;
+        u16 v1A = 0;
+        u16 v18 = 0;
+        u32 edi = 0, ebx = 0, ebp = 0, edx = 0;
+        u16 v20 = 0, v1E = 0, v16 = 0, v14 = 0, v12 = 0, v10 = 0, v0E = 0;
+
+        int rc, df_tuner;
+        int a, b, c, d;
+        pr_debug("%s %d\n", __FUNCTION__, s->config.d60);
+
+        if (s->config.d60 != 2)
+                goto set_tuner;
+        rc = CorrectSysClockDeviation(s);
+        if (rc < 0)
+                goto set_tuner;
+
+        s->config.d60 = 1;
+        rc = ConfigureMPEGOutput(s, 0);
+        if (rc < 0)
+                goto set_tuner;
+      set_tuner:
+
+        rc = PLL_Set(s, fep, &df_tuner);
+        if (rc < 0) {
+                printk(KERN_ERR "Error in pll_set\n");
+                goto exit_rc;
+        }
+        msleep(200);
+
+        a = rc = RD16(s, 0x2150016);
+        if (rc < 0)
+                goto exit_rc;
+        b = rc = RD16(s, 0x2150010);
+        if (rc < 0)
+                goto exit_rc;
+        c = rc = RD16(s, 0x2150034);
+        if (rc < 0)
+                goto exit_rc;
+        d = rc = RD16(s, 0x2150035);
+        if (rc < 0)
+                goto exit_rc;
+        rc = WR16(s, 0x2150014, c);
+        rc = WR16(s, 0x2150015, d);
+        rc = WR16(s, 0x2150010, 0);
+        rc = WR16(s, 0x2150000, 2);
+        rc = WR16(s, 0x2150036, 0x0fff);
+        rc = WR16(s, 0x2150016, a);
+
+        rc = WR16(s, 0x2150010, 2);
+        rc = WR16(s, 0x2150007, 0);
+        rc = WR16(s, 0x2150000, 1);
+        rc = WR16(s, 0x2110000, 0);
+        rc = WR16(s, 0x0800000, 0);
+        rc = WR16(s, 0x2800000, 0);
+        rc = WR16(s, 0x2110010, 0x664);
+
+        rc = write_fw(s, DRXD_ResetECRAM);
+        rc = WR16(s, 0x2110000, 1);
+
+        rc = write_fw(s, DRXD_InitSC);
+        if (rc < 0)
+                goto exit_rc;
+
+        rc = SetCfgIfAgc(s, &s->config.ifagc);
+        if (rc < 0)
+                goto exit_rc;
+
+        rc = SetCfgRfAgc(s, &s->config.rfagc);
+        if (rc < 0)
+                goto exit_rc;
+
+        if (fep->u.ofdm.transmission_mode != TRANSMISSION_MODE_2K)
+                v22 = 1;
+        switch (fep->u.ofdm.transmission_mode) {
+        case TRANSMISSION_MODE_8K:
+                edi = 1;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+
+                rc = WR16(s, 0x2010010, 0);
+                if (rc < 0)
+                        break;
+                v1C = 0x63;
+                v1A = 0x53;
+                v18 = 0x43;
+                break;
+        default:
+                edi = 0;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+
+                rc = WR16(s, 0x2010010, 1);
+                if (rc < 0)
+                        break;
+
+                v1C = 0x61;
+                v1A = 0x47;
+                v18 = 0x41;
+        }
+
+        switch (fep->u.ofdm.guard_interval) {
+        case GUARD_INTERVAL_1_4:
+                edi |= 0x0c;
+                break;
+        case GUARD_INTERVAL_1_8:
+                edi |= 0x08;
+                break;
+        case GUARD_INTERVAL_1_16:
+                edi |= 0x04;
+                break;
+        case GUARD_INTERVAL_1_32:
+                break;
+        default:
+                v22 |= 2;
+        }
+
+        ebx = 0;
+        ebp = 0;
+        v20 = 0;
+        v1E = 0;
+        v16 = 0;
+        v14 = 0;
+        v12 = 0;
+        v10 = 0;
+        v0E = 0;
+
+        switch (fep->u.ofdm.hierarchy_information) {
+        case HIERARCHY_1:
+                edi |= 0x40;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x1c10047, 1);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010012, 1);
+                if (rc < 0)
+                        goto exit_rc;
+                ebx = 0x19f;
+                ebp = 0x1fb;
+                v20 = 0x0c0;
+                v1E = 0x195;
+                v16 = 0x1d6;
+                v14 = 0x1ef;
+                v12 = 4;
+                v10 = 5;
+                v0E = 5;
+                break;
+        case HIERARCHY_2:
+                edi |= 0x80;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x1c10047, 2);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010012, 2);
+                if (rc < 0)
+                        goto exit_rc;
+                ebx = 0x08f;
+                ebp = 0x12f;
+                v20 = 0x0c0;
+                v1E = 0x11e;
+                v16 = 0x1d6;
+                v14 = 0x15e;
+                v12 = 4;
+                v10 = 5;
+                v0E = 5;
+                break;
+        case HIERARCHY_4:
+                edi |= 0xc0;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x1c10047, 3);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010012, 3);
+                if (rc < 0)
+                        goto exit_rc;
+                ebx = 0x14d;
+                ebp = 0x197;
+                v20 = 0x0c0;
+                v1E = 0x1ce;
+                v16 = 0x1d6;
+                v14 = 0x11a;
+                v12 = 4;
+                v10 = 6;
+                v0E = 5;
+                break;
+        default:
+                v22 |= 8;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x1c10047, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010012, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                //              QPSK    QAM16   QAM64
+                ebx = 0x19f;    //                 62
+                ebp = 0x1fb;    //                 15
+                v20 = 0x16a;    //  62
+                v1E = 0x195;    //         62
+                v16 = 0x1bb;    //  15
+                v14 = 0x1ef;    //         15
+                v12 = 5;        //  16
+                v10 = 5;        //         16
+                v0E = 5;        //                 16
+        }
+
+        switch (fep->u.ofdm.constellation) {
+        default:
+                v22 |= 4;
+        case QPSK:
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+
+                rc = WR16(s, 0x1c10046, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010011, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001a, 0x10);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001b, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001c, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10062, v20);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c1002a, v1C);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10015, v16);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10016, v12);
+                if (rc < 0)
+                        goto exit_rc;
+                break;
+        case QAM_16:
+                edi |= 0x10;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+
+                rc = WR16(s, 0x1c10046, 1);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010011, 1);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001a, 0x10);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001b, 4);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001c, 0);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10062, v1E);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c1002a, v1A);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10015, v14);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10016, v10);
+                if (rc < 0)
+                        goto exit_rc;
+                break;
+        case QAM_64:
+                edi |= 0x20;
+                rc = WR16(s, 0x1c10046, 2);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x2010011, 2);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001a, 0x20);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001b, 8);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x201001c, 2);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10062, ebx);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c1002a, v18);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10015, ebp);
+                if (rc < 0)
+                        goto exit_rc;
+                rc = WR16(s, 0x1c10016, v0E);
+                if (rc < 0)
+                        goto exit_rc;
+                break;
+        }
+
+        if (s->config.s20d24 == 1) {
+                rc = WR16(s, 0x2010013, 0);
+        } else {
+                rc = WR16(s, 0x2010013, 1);
+                edi |= 0x1000;
+        }
+
+        switch (fep->u.ofdm.code_rate_HP) {
+        default:
+                v22 |= 0x10;
+        case FEC_1_2:
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x2090011, 0);
+                break;
+        case FEC_2_3:
+                edi |= 0x200;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x2090011, 1);
+                break;
+        case FEC_3_4:
+                edi |= 0x400;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x2090011, 2);
+                break;
+        case FEC_5_6:           /* 5 */
+                edi |= 0x600;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x2090011, 3);
+                break;
+        case FEC_7_8:           /* 7 */
+                edi |= 0x800;
+                if (s->chip_rev == DRXD_FW_B1)
+                        break;
+                rc = WR16(s, 0x2090011, 4);
+                break;
+        };
+        if (rc < 0)
+                goto exit_rc;
+
+        switch (fep->u.ofdm.bandwidth) {
+        default:
+                rc = -EINVAL;
+                goto exit_rc;
+        case BANDWIDTH_8_MHZ:   /* 0 */
+        case BANDWIDTH_AUTO:
+                rc = WR16(s, 0x0c2003f, 0x32);
+                s->bandwidth_parm = ebx = 0x8b8249;     // 9142857
+                edx = 0;
+                break;
+        case BANDWIDTH_7_MHZ:
+                rc = WR16(s, 0x0c2003f, 0x3b);
+                s->bandwidth_parm = ebx = 0x7a1200;     // 8000000
+                edx = 0x4807;
+                break;
+        case BANDWIDTH_6_MHZ:
+                rc = WR16(s, 0x0c2003f, 0x47);
+                s->bandwidth_parm = ebx = 0x68a1b6;     // 6857142
+                edx = 0x0f07;
+                break;
+        };
+
+        if (rc < 0)
+                goto exit_rc;
+
+        rc = WR16(s, 0x08200ec, edx);
+        if (rc < 0)
+                goto exit_rc;
+
+        rc = RD16(s, 0x0820050);
+        if (rc < 0)
+                goto exit_rc;
+        rc = WR16(s, 0x0820050, rc);
+
+        {
+                /* Configure bandwidth specific factor */
+                ebx = div64_u64(((u64) (s->f_osc) << 21) + (ebx >> 1),
+                                     (u64)ebx) - 0x800000;
+                EXIT_RC(WR16(s, 0x0c50010, ebx & 0xffff));
+                EXIT_RC(WR16(s, 0x0c50011, ebx >> 16));
+
+                /* drx397xD oscillator calibration */
+                ebx = div64_u64(((u64) (s->config.f_if + df_tuner) << 28) +
+                                     (s->f_osc >> 1), (u64)s->f_osc);
+        }
+        ebx &= 0xfffffff;
+        if (fep->inversion == INVERSION_ON)
+                ebx = 0x10000000 - ebx;
+
+        EXIT_RC(WR16(s, 0x0c30010, ebx & 0xffff));
+        EXIT_RC(WR16(s, 0x0c30011, ebx >> 16));
+
+        EXIT_RC(WR16(s, 0x0800000, 1));
+        EXIT_RC(RD16(s, 0x0800000));
+
+
+        EXIT_RC(SC_WaitForReady(s));
+        EXIT_RC(WR16(s, 0x0820042, 0));
+        EXIT_RC(WR16(s, 0x0820041, v22));
+        EXIT_RC(WR16(s, 0x0820040, edi));
+        EXIT_RC(SC_SendCommand(s, 3));
+
+        rc = RD16(s, 0x0800000);
+
+        SC_WaitForReady(s);
+        WR16(s, 0x0820042, 0);
+        WR16(s, 0x0820041, 1);
+        WR16(s, 0x0820040, 1);
+        SC_SendCommand(s, 1);
+
+//      rc = WR16(s, 0x2150000, 1);
+//      if (rc < 0) goto exit_rc;
+
+        rc = WR16(s, 0x2150000, 2);
+        rc = WR16(s, 0x2150016, a);
+        rc = WR16(s, 0x2150010, 4);
+        rc = WR16(s, 0x2150036, 0);
+        rc = WR16(s, 0x2150000, 1);
+        s->config.d60 = 2;
+      exit_rc:
+        return rc;
+}
+
+/*******************************************************************************
+ * DVB interface
+ ******************************************************************************/
+
+static int drx397x_init(struct dvb_frontend *fe)
+{
+        struct drx397xD_state *s = fe->demodulator_priv;
+        int rc;
+
+        pr_debug("%s\n", __FUNCTION__);
+
+        s->config.rfagc.d00 = 2;        /* 0x7c */
+        s->config.rfagc.w04 = 0;
+        s->config.rfagc.w06 = 0x3ff;
+
+        s->config.ifagc.d00 = 0;        /* 0x68 */
+        s->config.ifagc.w04 = 0;
+        s->config.ifagc.w06 = 140;
+        s->config.ifagc.w08 = 0;
+        s->config.ifagc.w0A = 0x3ff;
+        s->config.ifagc.w0C = 0x388;
+
+        /* for signal strenght calculations */
+        s->config.ss76 = 820;
+        s->config.ss78 = 2200;
+        s->config.ss7A = 150;
+
+        /* HI_CfgCommand */
+        s->config.w50 = 4;
+        s->config.w52 = 9;      // 0xf;
+
+        s->config.f_if = 42800000;      /* d14: intermediate frequency [Hz]     */
+        s->config.f_osc = 48000;        /* s66 : oscillator frequency [kHz]     */
+        s->config.w92 = 12000;  // 20000;
+
+        s->config.w9C = 0x000e;
+        s->config.w9E = 0x0000;
+
+        /* ConfigureMPEGOutput params */
+        s->config.wA0 = 4;
+        s->config.w98 = 1;      // 0;
+        s->config.w9A = 1;
+
+        /* get chip revision */
+        rc = RD16(s, 0x2410019);
+        if (rc < 0)
+                return -ENODEV;
+
+        if (rc == 0) {
+                printk(KERN_INFO "%s: chip revision A2\n", mod_name);
+                rc = drx_load_fw(s, DRXD_FW_A2);
+        } else {
+
+                rc = (rc >> 12) - 3;
+                switch (rc) {
+                case 1:
+                        s->flags |= F_SET_0D4h;
+                case 0:
+                case 4:
+                        s->flags |= F_SET_0D0h;
+                        break;
+                case 2:
+                case 5:
+                        break;
+                case 3:
+                        s->flags |= F_SET_0D4h;
+                        break;
+                default:
+                        return -ENODEV;
+                };
+                printk(KERN_INFO "%s: chip revision B1.%d\n", mod_name, rc);
+                rc = drx_load_fw(s, DRXD_FW_B1);
+        }
+        if (rc < 0)
+                goto error;
+
+        rc = WR16(s, 0x0420033, 0x3973);
+        if (rc < 0)
+                goto error;
+
+        rc = HI_Command(s, 2);
+
+        msleep(1);
+
+        if (s->chip_rev == DRXD_FW_A2) {
+                rc = WR16(s, 0x043012d, 0x47F);
+                if (rc < 0)
+                        goto error;
+        }
+        rc = WR16_E0(s, 0x0400000, 0);
+        if (rc < 0)
+                goto error;
+
+        if (s->config.w92 > 20000 || s->config.w92 % 4000) {
+                printk(KERN_ERR "%s: invalid osc frequency\n", mod_name);
+                rc = -1;
+                goto error;
+        }
+
+        rc = WR16(s, 0x2410010, 1);
+        if (rc < 0)
+                goto error;
+        rc = WR16(s, 0x2410011, 0x15);
+        if (rc < 0)
+                goto error;
+        rc = WR16(s, 0x2410012, s->config.w92 / 4000);
+        if (rc < 0)
+                goto error;
+#ifdef ORIG_FW
+        rc = WR16(s, 0x2410015, 2);
+        if (rc < 0)
+                goto error;
+#endif
+        rc = WR16(s, 0x2410017, 0x3973);
+        if (rc < 0)
+                goto error;
+
+        s->f_osc = s->config.f_osc * 1000;      /* initial estimator */
+
+        s->config.w56 = 1;
+
+        rc = HI_CfgCommand(s);
+        if (rc < 0)
+                goto error;
+
+        rc = write_fw(s, DRXD_InitAtomicRead);
+        if (rc < 0)
+                goto error;
+
+        if (s->chip_rev == DRXD_FW_A2) {
+                rc = WR16(s, 0x2150013, 0);
+                if (rc < 0)
+                        goto error;
+        }
+
+        rc = WR16_E0(s, 0x0400002, 0);
+        if (rc < 0)
+                goto error;
+        rc = WR16(s, 0x0400002, 0);
+        if (rc < 0)
+                goto error;
+
+        if (s->chip_rev == DRXD_FW_A2) {
+                rc = write_fw(s, DRXD_ResetCEFR);
+                if (rc < 0)
+                        goto error;
+        }
+        rc = write_fw(s, DRXD_microcode);
+        if (rc < 0)
+                goto error;
+
+        s->config.w9C = 0x0e;
+        if (s->flags & F_SET_0D0h) {
+                s->config.w9C = 0;
+                rc = RD16(s, 0x0c20010);
+                if (rc < 0)
+                        goto write_DRXD_InitFE_1;
+
+                rc &= ~0x1000;
+                rc = WR16(s, 0x0c20010, rc);
+                if (rc < 0)
+                        goto write_DRXD_InitFE_1;
+
+                rc = RD16(s, 0x0c20011);
+                if (rc < 0)
+                        goto write_DRXD_InitFE_1;
+
+                rc &= ~0x8;
+                rc = WR16(s, 0x0c20011, rc);
+                if (rc < 0)
+                        goto write_DRXD_InitFE_1;
+
+                rc = WR16(s, 0x0c20012, 1);
+        }
+
+      write_DRXD_InitFE_1:
+
+        rc = write_fw(s, DRXD_InitFE_1);
+        if (rc < 0)
+                goto error;
+
+        rc = 1;
+        if (s->chip_rev == DRXD_FW_B1) {
+                if (s->flags & F_SET_0D0h)
+                        rc = 0;
+        } else {
+                if (s->flags & F_SET_0D0h)
+                        rc = 4;
+        }
+
+        rc = WR16(s, 0x0C20012, rc);
+        if (rc < 0)
+                goto error;
+
+        rc = WR16(s, 0x0C20013, s->config.w9E);
+        if (rc < 0)
+                goto error;
+        rc = WR16(s, 0x0C20015, s->config.w9C);
+        if (rc < 0)
+                goto error;
+
+        rc = write_fw(s, DRXD_InitFE_2);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitFT);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitCP);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitCE);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitEQ);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitEC);
+        if (rc < 0)
+                goto error;
+        rc = write_fw(s, DRXD_InitSC);
+        if (rc < 0)
+                goto error;
+
+        rc = SetCfgIfAgc(s, &s->config.ifagc);
+        if (rc < 0)
+                goto error;
+
+        rc = SetCfgRfAgc(s, &s->config.rfagc);
+        if (rc < 0)
+                goto error;
+
+        rc = ConfigureMPEGOutput(s, 1);
+        rc = WR16(s, 0x08201fe, 0x0017);
+        rc = WR16(s, 0x08201ff, 0x0101);
+
+        s->config.d5C = 0;
+        s->config.d60 = 1;
+        s->config.d48 = 1;
+      error:
+        return rc;
+}
+
+static int drx397x_get_frontend(struct dvb_frontend *fe,
+                                struct dvb_frontend_parameters *params)
+{
+        return 0;
+}
+
+static int drx397x_set_frontend(struct dvb_frontend *fe,
+                                struct dvb_frontend_parameters *params)
+{
+        struct drx397xD_state *s = fe->demodulator_priv;
+
+        s->config.s20d24 = 1;   // 0;
+        return drx_tune(s, params);
+}
+
+static int drx397x_get_tune_settings(struct dvb_frontend *fe,
+                                     struct dvb_frontend_tune_settings
+                                     *fe_tune_settings)
+{
+        fe_tune_settings->min_delay_ms = 10000;
+        fe_tune_settings->step_size = 0;
+        fe_tune_settings->max_drift = 0;
+        return 0;
+}
+
+static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)
+{
+        struct drx397xD_state *s = fe->demodulator_priv;
+        int lockstat;
+
+        GetLockStatus(s, &lockstat);
+        /* TODO */
+//      if (lockstat & 1)
+//      CorrectSysClockDeviation(s);
+
+        *status = 0;
+        if (lockstat & 2) {
+                CorrectSysClockDeviation(s);
+                ConfigureMPEGOutput(s, 1);
+                *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI;
+        }
+        if (lockstat & 4) {
+                *status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;
+        }
+
+        return 0;
+}
+
+static int drx397x_read_ber(struct dvb_frontend *fe, unsigned int *ber)
+{
+        *ber = 0;
+        return 0;
+}
+
+static int drx397x_read_snr(struct dvb_frontend *fe, u16 * snr)
+{
+        *snr = 0;
+        return 0;
+}
+
+static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
+{
+        struct drx397xD_state *s = fe->demodulator_priv;
+        int rc;
+
+        if (s->config.ifagc.d00 == 2) {
+                *strength = 0xffff;
+                return 0;
+        }
+        rc = RD16(s, 0x0c20035);
+        if (rc < 0) {
+                *strength = 0;
+                return 0;
+        }
+        rc &= 0x3ff;
+        /* Signal strength is calculated using the following formula:
+         *
+         * a = 2200 * 150 / (2200 + 150);
+         * a = a * 3300 /  (a + 820);
+         * b = 2200 * 3300 / (2200 + 820);
+         * c = (((b-a) * rc) >> 10  + a) << 4;
+         * strength = ~c & 0xffff;
+         *
+         * The following does the same but with less rounding errors:
+         */
+        *strength = ~(7720 + (rc * 30744 >> 10));
+        return 0;
+}
+
+static int drx397x_read_ucblocks(struct dvb_frontend *fe,
+                                 unsigned int *ucblocks)
+{
+        *ucblocks = 0;
+        return 0;
+}
+
+static int drx397x_sleep(struct dvb_frontend *fe)
+{
+        return 0;
+}
+
+static void drx397x_release(struct dvb_frontend *fe)
+{
+        struct drx397xD_state *s = fe->demodulator_priv;
+        printk(KERN_INFO "%s: release demodulator\n", mod_name);
+        if (s) {
+                drx_release_fw(s);
+                kfree(s);
+        }
+
+}
+
+static struct dvb_frontend_ops drx397x_ops = {
+
+        .info = {
+                 .name                  = "Micronas DRX397xD DVB-T Frontend",
+                 .type                  = FE_OFDM,
+                 .frequency_min         = 47125000,
+                 .frequency_max         = 855250000,
+                 .frequency_stepsize    = 166667,
+                 .frequency_tolerance   = 0,
+                 .caps =                                        /* 0x0C01B2EAE */
+                         FE_CAN_FEC_1_2                 |       // = 0x2,
+                         FE_CAN_FEC_2_3                 |       // = 0x4,
+                         FE_CAN_FEC_3_4                 |       // = 0x8,
+                         FE_CAN_FEC_5_6                 |       // = 0x20,
+                         FE_CAN_FEC_7_8                 |       // = 0x80,
+                         FE_CAN_FEC_AUTO                |       // = 0x200,
+                         FE_CAN_QPSK                    |       // = 0x400,
+                         FE_CAN_QAM_16                  |       // = 0x800,
+                         FE_CAN_QAM_64                  |       // = 0x2000,
+                         FE_CAN_QAM_AUTO                |       // = 0x10000,
+                         FE_CAN_TRANSMISSION_MODE_AUTO  |       // = 0x20000,
+                         FE_CAN_GUARD_INTERVAL_AUTO     |       // = 0x80000,
+                         FE_CAN_HIERARCHY_AUTO          |       // = 0x100000,
+                         FE_CAN_RECOVER                 |       // = 0x40000000,
+                         FE_CAN_MUTE_TS                         // = 0x80000000
+         },
+
+        .release = drx397x_release,
+        .init = drx397x_init,
+        .sleep = drx397x_sleep,
+
+        .set_frontend = drx397x_set_frontend,
+        .get_tune_settings = drx397x_get_tune_settings,
+        .get_frontend = drx397x_get_frontend,
+
+        .read_status = drx397x_read_status,
+        .read_snr = drx397x_read_snr,
+        .read_signal_strength = drx397x_read_signal_strength,
+        .read_ber = drx397x_read_ber,
+        .read_ucblocks = drx397x_read_ucblocks,
+};
+
+struct dvb_frontend *drx397xD_attach(const struct drx397xD_config *config,
+                                     struct i2c_adapter *i2c)
+{
+        struct drx397xD_state *s = NULL;
+
+        /* allocate memory for the internal state */
+        s = kzalloc(sizeof(struct drx397xD_state), GFP_KERNEL);
+        if (s == NULL)
+                goto error;
+
+        /* setup the state */
+        s->i2c = i2c;
+        memcpy(&s->config, config, sizeof(struct drx397xD_config));
+
+        /* check if the demod is there */
+        if (RD16(s, 0x2410019) < 0)
+                goto error;
+
+        /* create dvb_frontend */
+        memcpy(&s->frontend.ops, &drx397x_ops, sizeof(struct dvb_frontend_ops));
+        s->frontend.demodulator_priv = s;
+
+        return &s->frontend;
+      error:
+        kfree(s);
+        return NULL;
+}
+
+MODULE_DESCRIPTION("Micronas DRX397xD DVB-T Frontend");
+MODULE_AUTHOR("Henk Vergonet");
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(drx397xD_attach);
diff --git a/drivers/media/dvb/frontends/drx397xD.h b/drivers/media/dvb/frontends/drx397xD.h
new file mode 100644
index 000000000000..ddc7a07971b7
--- /dev/null
+++ b/drivers/media/dvb/frontends/drx397xD.h
@@ -0,0 +1,130 @@
+/*
+ *  Driver for Micronas DVB-T drx397xD demodulator
+ *
+ *  Copyright (C) 2007 Henk vergonet <Henk.Vergonet@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
+ */
+
+#ifndef _DRX397XD_H_INCLUDED
+#define _DRX397XD_H_INCLUDED
+
+#include <linux/dvb/frontend.h>
+
+#define DRX_F_STEPSIZE  166667
+#define DRX_F_OFFSET    36000000
+
+#define I2C_ADR_C0(x) \
+(       (u32)cpu_to_le32( \
+                (u32)( \
+                        (((u32)(x) & (u32)0x000000ffUL)      ) | \
+                        (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
+                        (((u32)(x) & (u32)0x0fff0000UL) >>  8) | \
+                         (           (u32)0x00c00000UL)          \
+                      )) \
+)
+
+#define I2C_ADR_E0(x) \
+(       (u32)cpu_to_le32( \
+                (u32)( \
+                        (((u32)(x) & (u32)0x000000ffUL)      ) | \
+                        (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
+                        (((u32)(x) & (u32)0x0fff0000UL) >>  8) | \
+                         (           (u32)0x00e00000UL)          \
+                      )) \
+)
+
+struct drx397xD_CfgRfAgc        /* 0x7c */
+{
+        int d00;        /* 2 */
+        u16 w04;
+        u16 w06;
+};
+
+struct drx397xD_CfgIfAgc        /* 0x68 */
+{
+        int d00;        /* 0 */
+        u16 w04;        /* 0 */
+        u16 w06;
+        u16 w08;
+        u16 w0A;
+        u16 w0C;
+};
+
+struct drx397xD_s20 {
+        int d04;
+        u32 d18;
+        u32 d1C;
+        u32 d20;
+        u32 d14;
+        u32 d24;
+        u32 d0C;
+        u32 d08;
+};
+
+struct drx397xD_config
+{
+        /* demodulator's I2C address */
+        u8      demod_address;          /* 0x0f */
+
+        struct drx397xD_CfgIfAgc  ifagc;  /* 0x68 */
+        struct drx397xD_CfgRfAgc  rfagc;  /* 0x7c */
+        u32     s20d24;
+
+        /* HI_CfgCommand parameters */
+        u16     w50, w52, /* w54, */ w56;
+
+        int     d5C;
+        int     d60;
+        int     d48;
+        int     d28;
+
+        u32     f_if;   /* d14: intermediate frequency [Hz]             */
+                        /*      36000000 on Cinergy 2400i DT            */
+                        /*      42800000 on Pinnacle Hybrid PRO 330e    */
+
+        u16     f_osc;  /* s66: 48000 oscillator frequency [kHz]        */
+
+        u16     w92;    /* 20000 */
+
+        u16     wA0;
+        u16     w98;
+        u16     w9A;
+
+        u16     w9C;    /* 0xe0 */
+        u16     w9E;    /* 0x00 */
+
+        /* used for signal strength calculations in
+           drx397x_read_signal_strength
+        */
+        u16     ss78;   // 2200
+        u16     ss7A;   // 150
+        u16     ss76;   // 820
+};
+
+#if defined(CONFIG_DVB_DRX397XD) || (defined(CONFIG_DVB_DRX397XD_MODULE) && defined(MODULE))
+extern struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config,
+                                           struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config,
+                                           struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_DRX397XD */
+
+#endif /* _DRX397XD_H_INCLUDED */
diff --git a/drivers/media/dvb/frontends/drx397xD_fw.h b/drivers/media/dvb/frontends/drx397xD_fw.h
new file mode 100644
index 000000000000..01de02a81cd4
--- /dev/null
+++ b/drivers/media/dvb/frontends/drx397xD_fw.h
@@ -0,0 +1,40 @@
+/*
+ * Firmware definitions for Micronas drx397xD
+ *
+ * Copyright (C) 2007 Henk Vergonet <Henk.Vergonet@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef _FW_ENTRY
+        _FW_ENTRY("drx397xD.A2.fw",     DRXD_FW_A2 = 0          ),
+        _FW_ENTRY("drx397xD.B1.fw",     DRXD_FW_B1              ),
+#undef _FW_ENTRY
+#endif /* _FW_ENTRY */
+
+#ifdef _BLOB_ENTRY
+        _BLOB_ENTRY("InitAtomicRead",   DRXD_InitAtomicRead = 0 ),
+        _BLOB_ENTRY("InitCE",           DRXD_InitCE             ),
+        _BLOB_ENTRY("InitCP",           DRXD_InitCP             ),
+        _BLOB_ENTRY("InitEC",           DRXD_InitEC             ),
+        _BLOB_ENTRY("InitEQ",           DRXD_InitEQ             ),
+        _BLOB_ENTRY("InitFE_1",         DRXD_InitFE_1           ),
+        _BLOB_ENTRY("InitFE_2",         DRXD_InitFE_2           ),
+        _BLOB_ENTRY("InitFT",           DRXD_InitFT             ),
+        _BLOB_ENTRY("InitSC",           DRXD_InitSC             ),
+        _BLOB_ENTRY("ResetCEFR",        DRXD_ResetCEFR          ),
+        _BLOB_ENTRY("ResetECRAM",       DRXD_ResetECRAM         ),
+        _BLOB_ENTRY("microcode",        DRXD_microcode          ),
+#undef _BLOB_ENTRY
+#endif /* _BLOB_ENTRY */
diff --git a/drivers/media/dvb/frontends/z0194a.h b/drivers/media/dvb/frontends/z0194a.h
new file mode 100644
index 000000000000..d2876d2e1769
--- /dev/null
+++ b/drivers/media/dvb/frontends/z0194a.h
@@ -0,0 +1,97 @@
+/* z0194a.h Sharp z0194a tuner support
+*
+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+*
+*       This program is free software; you can redistribute it and/or modify it
+*       under the terms of the GNU General Public License as published by the
+*       Free Software Foundation, version 2.
+*
+* see Documentation/dvb/README.dvb-usb for more information
+*/
+
+#ifndef Z0194A
+#define Z0194A
+
+static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,
+                                         u32 srate, u32 ratio)
+{
+        u8 aclk = 0;
+        u8 bclk = 0;
+
+        if (srate < 1500000) {
+                aclk = 0xb7; bclk = 0x47; }
+        else if (srate < 3000000) {
+                aclk = 0xb7; bclk = 0x4b; }
+        else if (srate < 7000000) {
+                aclk = 0xb7; bclk = 0x4f; }
+        else if (srate < 14000000) {
+                aclk = 0xb7; bclk = 0x53; }
+        else if (srate < 30000000) {
+                aclk = 0xb6; bclk = 0x53; }
+        else if (srate < 45000000) {
+                aclk = 0xb4; bclk = 0x51; }
+
+        stv0299_writereg(fe, 0x13, aclk);
+        stv0299_writereg(fe, 0x14, bclk);
+        stv0299_writereg(fe, 0x1f, (ratio >> 16) & 0xff);
+        stv0299_writereg(fe, 0x20, (ratio >> 8) & 0xff);
+        stv0299_writereg(fe, 0x21, (ratio) & 0xf0);
+
+        return 0;
+}
+
+static u8 sharp_z0194a__inittab[] = {
+        0x01, 0x15,
+        0x02, 0x00,
+        0x03, 0x00,
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x06, 0x40,   /* DAC not used, set to high impendance mode */
+        0x07, 0x00,   /* DAC LSB */
+        0x08, 0x40,   /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x09, 0x00,   /* FIFO */
+        0x0c, 0x51,   /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0d, 0x82,   /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
+        0x10, 0x3f,   /* AGC2  0x3d */
+        0x11, 0x84,
+        0x12, 0xb9,
+        0x15, 0xc9,   /* lock detector threshold */
+        0x16, 0x00,
+        0x17, 0x00,
+        0x18, 0x00,
+        0x19, 0x00,
+        0x1a, 0x00,
+        0x1f, 0x50,
+        0x20, 0x00,
+        0x21, 0x00,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x28, 0x00,  /* out imp: normal  out type: parallel FEC mode:0 */
+        0x29, 0x1e,  /* 1/2 threshold */
+        0x2a, 0x14,  /* 2/3 threshold */
+        0x2b, 0x0f,  /* 3/4 threshold */
+        0x2c, 0x09,  /* 5/6 threshold */
+        0x2d, 0x05,  /* 7/8 threshold */
+        0x2e, 0x01,
+        0x31, 0x1f,  /* test all FECs */
+        0x32, 0x19,  /* viterbi and synchro search */
+        0x33, 0xfc,  /* rs control */
+        0x34, 0x93,  /* error control */
+        0x0f, 0x52,
+        0xff, 0xff
+};
+
+static struct stv0299_config sharp_z0194a_config = {
+        .demod_address = 0x68,
+        .inittab = sharp_z0194a__inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .skip_reinit = 0,
+        .lock_output = STV0299_LOCKOUTPUT_1,
+        .volt13_op0_op1 = STV0299_VOLT13_OP1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = sharp_z0194a__set_symbol_rate,
+};
+
+#endif
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index b4b8ed795c95..c5f45fed69dc 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -110,12 +110,12 @@ struct smscore_registry_entry_t {
         enum sms_device_type_st type;
 };
 
-struct list_head g_smscore_notifyees;
-struct list_head g_smscore_devices;
-struct mutex g_smscore_deviceslock;
+static struct list_head g_smscore_notifyees;
+static struct list_head g_smscore_devices;
+static struct mutex g_smscore_deviceslock;
 
-struct list_head g_smscore_registry;
-struct mutex g_smscore_registrylock;
+static struct list_head g_smscore_registry;
+static struct mutex g_smscore_registrylock;
 
 static int default_mode = 4;
 
@@ -1187,7 +1187,7 @@ int smsclient_sendrequest(struct smscore_client_t *client,
 }
 
 
-int smscore_module_init(void)
+static int __init smscore_module_init(void)
 {
         int rc = 0;
 
@@ -1209,7 +1209,7 @@ int smscore_module_init(void)
         return rc;
 }
 
-void smscore_module_exit(void)
+static void __exit smscore_module_exit(void)
 {
 
         kmutex_lock(&g_smscore_deviceslock);
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 6f9c18563867..229274a14110 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -27,8 +27,8 @@
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-struct list_head g_smsdvb_clients;
-struct mutex g_smsdvb_clientslock;
+static struct list_head g_smsdvb_clients;
+static struct mutex g_smsdvb_clientslock;
 
 static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
 {
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 87c973ac668b..41b5a988b619 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -5,8 +5,6 @@ config TTPCI_EEPROM
 config DVB_AV7110
         tristate "AV7110 cards"
         depends on DVB_CORE && PCI && I2C
-        depends on HOTPLUG
-        select FW_LOADER if !DVB_AV7110_FIRMWARE
         select TTPCI_EEPROM
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
@@ -127,14 +125,12 @@ config DVB_BUDGET_AV
         depends on DVB_BUDGET_CORE && I2C
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
-        depends on HOTPLUG      # dependency of FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
         select DVB_TDA10023 if !DVB_FE_CUSTOMISE
         select DVB_TUA6100 if !DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           Support for simple SAA7146 based DVB cards
           (so called Budget- or Nova-PCI cards) without onboard
diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/dvb/ttusb-dec/Kconfig
index a23cc0aa17d3..d5f48a3102bd 100644
--- a/drivers/media/dvb/ttusb-dec/Kconfig
+++ b/drivers/media/dvb/ttusb-dec/Kconfig
@@ -1,8 +1,6 @@
 config DVB_TTUSB_DEC
         tristate "Technotrend/Hauppauge USB DEC devices"
         depends on DVB_CORE && USB && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
-        select FW_LOADER
         select CRC32
         help
           Support for external USB adapters designed by Technotrend and
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 4e3f83e4e48f..1ed88f3abe61 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -85,6 +85,7 @@
 #include <linux/input.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 
 /*
@@ -444,14 +445,7 @@ static const struct file_operations usb_dsbr100_fops = {
         .llseek         = no_llseek,
 };
 
-/* V4L2 interface */
-static struct video_device dsbr100_videodev_template =
-{
-        .owner          = THIS_MODULE,
-        .name           = "D-Link DSB-R 100",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &usb_dsbr100_fops,
-        .release        = video_device_release,
+static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -466,6 +460,14 @@ static struct video_device dsbr100_videodev_template =
         .vidioc_s_input     = vidioc_s_input,
 };
 
+/* V4L2 interface */
+static struct video_device dsbr100_videodev_template = {
+        .name           = "D-Link DSB-R 100",
+        .fops           = &usb_dsbr100_fops,
+        .ioctl_ops      = &usb_dsbr100_ioctl_ops,
+        .release        = video_device_release,
+};
+
 /* check if the device is present and register with v4l and
 usb if it is */
 static int usb_dsbr100_probe(struct usb_interface *intf,
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 09fe6f1cdf14..7fd7ee2d32c1 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include "oss/aci.h"
 #include "miropcm20-rds-core.h"
 
@@ -228,9 +229,7 @@ static const struct file_operations pcm20_fops = {
 };
 
 static struct video_device pcm20_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Miro PCM 20 radio",
-        .type           = VID_TYPE_TUNER,
         .fops           = &pcm20_fops,
         .priv           = &pcm20_unit
 };
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 1ec18ed1a733..eba9209b3024 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -36,6 +36,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
@@ -388,12 +389,7 @@ static const struct file_operations rtrack_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device rtrack_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "RadioTrack radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &rtrack_fops,
+static const struct v4l2_ioctl_ops rtrack_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -408,6 +404,12 @@ static struct video_device rtrack_radio=
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device rtrack_radio = {
+        .name           = "RadioTrack radio",
+        .fops           = &rtrack_fops,
+        .ioctl_ops      = &rtrack_ioctl_ops,
+};
+
 static int __init rtrack_init(void)
 {
         if(io==-1)
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 46cdb549eac7..3fe5504428c5 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -33,6 +33,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
@@ -352,12 +353,7 @@ static const struct file_operations aztech_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device aztech_radio=
-{
-        .owner              = THIS_MODULE,
-        .name               = "Aztech radio",
-        .type               = VID_TYPE_TUNER,
-        .fops               = &aztech_fops,
+static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -372,6 +368,12 @@ static struct video_device aztech_radio=
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device aztech_radio = {
+        .name               = "Aztech radio",
+        .fops               = &aztech_fops,
+        .ioctl_ops          = &aztech_ioctl_ops,
+};
+
 module_param_named(debug,aztech_radio.debug, int, 0644);
 MODULE_PARM_DESC(debug,"activates debug info");
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index b14db53ea456..6166e726ed72 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -39,6 +39,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* V4L2 API defs                */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/param.h>
 #include <linux/pnp.h>
 
@@ -569,12 +570,7 @@ static const struct file_operations cadet_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device cadet_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "Cadet radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &cadet_fops,
+static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -589,6 +585,12 @@ static struct video_device cadet_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static struct video_device cadet_radio = {
+        .name           = "Cadet radio",
+        .fops           = &cadet_fops,
+        .ioctl_ops      = &cadet_ioctl_ops,
+};
+
 #ifdef CONFIG_PNP
 
 static struct pnp_device_id cadet_pnp_devices[] = {
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index de49be971480..36e754e3ffb2 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -46,6 +46,7 @@
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/errno.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
@@ -374,11 +375,7 @@ static const struct file_operations gemtek_pci_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device vdev_template = {
-        .owner         = THIS_MODULE,
-        .name          = "Gemtek PCI Radio",
-        .type          = VID_TYPE_TUNER,
-        .fops          = &gemtek_pci_fops,
+static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -393,6 +390,12 @@ static struct video_device vdev_template = {
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device vdev_template = {
+        .name          = "Gemtek PCI Radio",
+        .fops          = &gemtek_pci_fops,
+        .ioctl_ops     = &gemtek_pci_ioctl_ops,
+};
+
 static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id )
 {
         struct gemtek_pci_card *card;
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 81f6aeb1cd11..2b1a6221de6d 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>             /* outb, outb_p                 */
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
+#include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
 #include <linux/spinlock.h>
 
@@ -552,11 +553,7 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
         return 0;
 }
 
-static struct video_device gemtek_radio = {
-        .owner                  = THIS_MODULE,
-        .name                   = "GemTek Radio card",
-        .type                   = VID_TYPE_TUNER,
-        .fops                   = &gemtek_fops,
+static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
         .vidioc_g_tuner         = vidioc_g_tuner,
         .vidioc_s_tuner         = vidioc_s_tuner,
@@ -571,6 +568,12 @@ static struct video_device gemtek_radio = {
         .vidioc_s_ctrl          = vidioc_s_ctrl
 };
 
+static struct video_device gemtek_radio = {
+        .name                   = "GemTek Radio card",
+        .fops                   = &gemtek_fops,
+        .ioctl_ops              = &gemtek_ioctl_ops,
+};
+
 /*
  * Initialization / cleanup related stuff.
  */
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index bddd3c409aa9..0ada1c697e8a 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,6)
@@ -354,10 +355,7 @@ static u16 __devinit radio_power_on(struct radio_device *dev)
         return (ofreq == radio_bits_get(dev));
 }
 
-static struct video_device maestro_radio = {
-        .name           = "Maestro radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &maestro_fops,
+static const struct v4l2_ioctl_ops maestro_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -372,6 +370,12 @@ static struct video_device maestro_radio = {
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device maestro_radio = {
+        .name           = "Maestro radio",
+        .fops           = &maestro_fops,
+        .ioctl_ops      = &maestro_ioctl_ops,
+};
+
 static int __devinit maestro_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 0133ecf3e040..43c75497dc49 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -44,6 +44,7 @@
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #define DRIVER_VERSION  "0.77"
 
@@ -373,13 +374,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
         return -EINVAL;
 }
 
-static struct video_device maxiradio_radio =
-{
-        .owner              = THIS_MODULE,
-        .name               = "Maxi Radio FM2000 radio",
-        .type               = VID_TYPE_TUNER,
-        .fops               = &maxiradio_fops,
-
+static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -394,6 +389,12 @@ static struct video_device maxiradio_radio =
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device maxiradio_radio = {
+        .name               = "Maxi Radio FM2000 radio",
+        .fops               = &maxiradio_fops,
+        .ioctl_ops          = &maxiradio_ioctl_ops,
+};
+
 static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         if(!request_region(pci_resource_start(pdev, 0),
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 070802103dc3..e2dde0807268 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -17,6 +17,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/spinlock.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
@@ -294,12 +295,7 @@ static const struct file_operations rtrack2_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device rtrack2_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "RadioTrack II radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &rtrack2_fops,
+static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -314,6 +310,12 @@ static struct video_device rtrack2_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static struct video_device rtrack2_radio = {
+        .name           = "RadioTrack II radio",
+        .fops           = &rtrack2_fops,
+        .ioctl_ops      = &rtrack2_ioctl_ops,
+};
+
 static int __init rtrack2_init(void)
 {
         if(io==-1)
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 66e052fd3909..bb5d92f104af 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>        /* udelay                       */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/isapnp.h>
 #include <asm/io.h>             /* outb, outb_p                 */
 #include <asm/uaccess.h>        /* copy to/from user            */
@@ -294,12 +295,7 @@ static const struct file_operations fmi_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device fmi_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "SF16FMx radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &fmi_fops,
+static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -314,6 +310,12 @@ static struct video_device fmi_radio=
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device fmi_radio = {
+        .name           = "SF16FMx radio",
+        .fops           = &fmi_fops,
+        .ioctl_ops      = &fmi_ioctl_ops,
+};
+
 /* ladis: this is my card. does any other types exist? */
 static struct isapnp_device_id id_table[] __devinitdata = {
         {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index b0ccf7cb5952..6290553d24be 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -22,6 +22,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 static struct mutex lock;
@@ -410,12 +411,7 @@ static const struct file_operations fmr2_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device fmr2_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "SF16FMR2 radio",
-        . type          = VID_TYPE_TUNER,
-        .fops           = &fmr2_fops,
+static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -430,6 +426,12 @@ static struct video_device fmr2_radio=
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device fmr2_radio = {
+        .name           = "SF16FMR2 radio",
+        .fops           = &fmr2_fops,
+        .ioctl_ops      = &fmr2_ioctl_ops,
+};
+
 static int __init fmr2_init(void)
 {
         fmr2_unit.port = io;
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index dc93a882b385..a4984ff87c9c 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -133,6 +133,7 @@
 #include <linux/videodev2.h>
 #include <linux/mutex.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/rds.h>
 #include <asm/unaligned.h>
 
@@ -1585,15 +1586,7 @@ done:
         return retval;
 }
 
-
-/*
- * si470x_viddev_tamples - video device interface
- */
-static struct video_device si470x_viddev_template = {
-        .fops                   = &si470x_fops,
-        .name                   = DRIVER_NAME,
-        .type                   = VID_TYPE_TUNER,
-        .release                = video_device_release,
+static const struct v4l2_ioctl_ops si470x_ioctl_ops = {
         .vidioc_querycap        = si470x_vidioc_querycap,
         .vidioc_g_input         = si470x_vidioc_g_input,
         .vidioc_s_input         = si470x_vidioc_s_input,
@@ -1607,7 +1600,16 @@ static struct video_device si470x_viddev_template = {
         .vidioc_g_frequency     = si470x_vidioc_g_frequency,
         .vidioc_s_frequency     = si470x_vidioc_s_frequency,
         .vidioc_s_hw_freq_seek  = si470x_vidioc_s_hw_freq_seek,
-        .owner                  = THIS_MODULE,
+};
+
+/*
+ * si470x_viddev_tamples - video device interface
+ */
+static struct video_device si470x_viddev_template = {
+        .fops                   = &si470x_fops,
+        .ioctl_ops              = &si470x_ioctl_ops,
+        .name                   = DRIVER_NAME,
+        .release                = video_device_release,
 };
 
 
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index acc32080e9bd..cefa44fc5aed 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -32,6 +32,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/spinlock.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
@@ -366,12 +367,7 @@ static const struct file_operations terratec_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device terratec_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "TerraTec ActiveRadio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &terratec_fops,
+static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -386,6 +382,12 @@ static struct video_device terratec_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static struct video_device terratec_radio = {
+        .name           = "TerraTec ActiveRadio",
+        .fops           = &terratec_fops,
+        .ioctl_ops      = &terratec_ioctl_ops,
+};
+
 static int __init terratec_init(void)
 {
         if(io==-1)
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 4ebdfbadeb9c..d70172d23edb 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -23,6 +23,7 @@
 #include <asm/uaccess.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
@@ -346,12 +347,7 @@ static const struct file_operations trust_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device trust_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "Trust FM Radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &trust_fops,
+static const struct v4l2_ioctl_ops trust_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -366,6 +362,12 @@ static struct video_device trust_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static struct video_device trust_radio = {
+        .name           = "Trust FM Radio",
+        .fops           = &trust_fops,
+        .ioctl_ops      = &trust_ioctl_ops,
+};
+
 static int __init trust_init(void)
 {
         if(io == -1) {
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 18f2abd7e255..f8d62cfea774 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -40,6 +40,7 @@
 #include <asm/uaccess.h>        /* copy to/from user              */
 #include <linux/videodev2.h>    /* kernel radio structs           */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,1,1)
@@ -344,12 +345,7 @@ static const struct file_operations typhoon_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device typhoon_radio =
-{
-        .owner          = THIS_MODULE,
-        .name           = "Typhoon Radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &typhoon_fops,
+static const struct v4l2_ioctl_ops typhoon_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -364,6 +360,12 @@ static struct video_device typhoon_radio =
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device typhoon_radio = {
+        .name           = "Typhoon Radio",
+        .fops           = &typhoon_fops,
+        .ioctl_ops      = &typhoon_ioctl_ops,
+};
+
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
 
 static int typhoon_proc_show(struct seq_file *m, void *v)
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 43773c56c62f..9f17a332fa11 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -37,6 +37,7 @@
 #include <asm/uaccess.h>        /* copy to/from user              */
 #include <linux/videodev2.h>    /* kernel radio structs           */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
@@ -407,12 +408,7 @@ static const struct file_operations zoltrix_fops =
         .llseek         = no_llseek,
 };
 
-static struct video_device zoltrix_radio =
-{
-        .owner          = THIS_MODULE,
-        .name           = "Zoltrix Radio Plus",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &zoltrix_fops,
+static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -427,6 +423,12 @@ static struct video_device zoltrix_radio =
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device zoltrix_radio = {
+        .name           = "Zoltrix Radio Plus",
+        .fops           = &zoltrix_fops,
+        .ioctl_ops      = &zoltrix_ioctl_ops,
+};
+
 static int __init zoltrix_init(void)
 {
         if (io == -1) {
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f606d2951fde..d4a6e56a7135 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -487,17 +487,6 @@ config VIDEO_PMS
           To compile this driver as a module, choose M here: the
           module will be called pms.
 
-config VIDEO_PLANB
-        tristate "PlanB Video-In on PowerMac"
-        depends on PPC_PMAC && VIDEO_V4L1 && BROKEN
-        help
-          PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
-          input hardware. If you want to experiment with this, say Y.
-          Otherwise, or if you don't understand a word, say N. See
-          <http://www.cpu.lu/~mlan/linux/dev/planb.html> for more info.
-
-          Saying M will compile this driver as a module (planb).
-
 config VIDEO_BWQCAM
         tristate "Quickcam BW Video For Linux"
         depends on PARPORT && VIDEO_V4L1
@@ -806,13 +795,7 @@ menuconfig V4L_USB_DRIVERS
 
 if V4L_USB_DRIVERS && USB
 
-config USB_VIDEO_CLASS
-        tristate "USB Video Class (UVC)"
-        ---help---
-          Support for the USB Video Class (UVC).  Currently only video
-          input devices, such as webcams, are supported.
-
-          For more information see: <http://linux-uvc.berlios.de/>
+source "drivers/media/video/uvc/Kconfig"
 
 source "drivers/media/video/gspca/Kconfig"
 
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 45d5db5abb1e..bbc6f8b82297 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,6 +10,8 @@ msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 stkwebcam-objs  :=      stk-webcam.o stk-sensor.o
 
+videodev-objs   :=      v4l2-dev.o v4l2-ioctl.o
+
 obj-$(CONFIG_VIDEO_DEV) += videodev.o compat_ioctl32.o v4l2-int-device.o
 
 obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
@@ -55,7 +57,6 @@ obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o
 obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o
 
 obj-$(CONFIG_VIDEO_PMS) += pms.o
-obj-$(CONFIG_VIDEO_PLANB) += planb.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o
 obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
 obj-$(CONFIG_VIDEO_CPIA) += cpia.o
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 8c7d1958856b..56ebfd5ef6fa 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -754,7 +754,6 @@ static const struct file_operations ar_fops = {
 };
 
 static struct video_device ar_template = {
-        .owner          = THIS_MODULE,
         .name           = "Colour AR VGA",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &ar_fops,
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index 52b2491581a8..ed9a50f189fc 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -6,6 +6,7 @@ config VIDEO_AU0828
         select VIDEO_TVEEPROM
         select DVB_AU8522 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Auvitek's USB device.
 
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 898e12395e7c..443e59009762 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -32,6 +32,9 @@ struct au0828_board au0828_boards[] = {
         [AU0828_BOARD_HAUPPAUGE_HVR950Q] = {
                 .name   = "Hauppauge HVR950Q",
         },
+        [AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL] = {
+                .name   = "Hauppauge HVR950Q rev xxF8",
+        },
         [AU0828_BOARD_DVICO_FUSIONHDTV7] = {
                 .name   = "DViCO FusionHDTV USB",
         },
@@ -49,6 +52,7 @@ int au0828_tuner_callback(void *priv, int command, int arg)
         switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+        case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
         case AU0828_BOARD_DVICO_FUSIONHDTV7:
                 if (command == 0) {
                         /* Tuner Reset Command from xc5000 */
@@ -110,6 +114,7 @@ void au0828_card_setup(struct au0828_dev *dev)
         switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+        case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
                 if (dev->i2c_rc == 0)
                         hauppauge_eeprom(dev, eeprom+0xa0);
                 break;
@@ -128,6 +133,7 @@ void au0828_gpio_setup(struct au0828_dev *dev)
         switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+        case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
                 /* GPIO's
                  * 4 - CS5340
                  * 5 - AU8522 Demodulator
@@ -193,6 +199,12 @@ struct usb_device_id au0828_usb_id_table [] = {
                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
         { USB_DEVICE(0x0fd9, 0x0008),
                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+        { USB_DEVICE(0x2040, 0x7201),
+                .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+        { USB_DEVICE(0x2040, 0x7211),
+                .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+        { USB_DEVICE(0x2040, 0x7281),
+                .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
         { },
 };
 
diff --git a/drivers/media/video/au0828/au0828-cards.h b/drivers/media/video/au0828/au0828-cards.h
index e26f54a961d0..c37f5fd0fa80 100644
--- a/drivers/media/video/au0828/au0828-cards.h
+++ b/drivers/media/video/au0828/au0828-cards.h
@@ -23,3 +23,4 @@
 #define AU0828_BOARD_HAUPPAUGE_HVR950Q  1
 #define AU0828_BOARD_HAUPPAUGE_HVR850   2
 #define AU0828_BOARD_DVICO_FUSIONHDTV7  3
+#define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL      4
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index c6d470590380..584a83a94a2a 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -28,6 +28,7 @@
 #include "au0828.h"
 #include "au8522.h"
 #include "xc5000.h"
+#include "mxl5007t.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
@@ -45,6 +46,11 @@ static struct xc5000_config hauppauge_hvr950q_tunerconfig = {
         .tuner_callback   = au0828_tuner_callback
 };
 
+static struct mxl5007t_config mxl5007t_hvr950q_config = {
+        .xtal_freq_hz = MxL_XTAL_24_MHZ,
+        .if_freq_hz = MxL_IF_6_MHZ,
+};
+
 /*-------------------------------------------------------------------*/
 static void urb_completion(struct urb *purb)
 {
@@ -342,6 +348,15 @@ int au0828_dvb_register(struct au0828_dev *dev)
                                 &dev->i2c_adap,
                                 &hauppauge_hvr950q_tunerconfig, dev);
                 break;
+        case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+                dvb->frontend = dvb_attach(au8522_attach,
+                                &hauppauge_hvr950q_config,
+                                &dev->i2c_adap);
+                if (dvb->frontend != NULL)
+                        dvb_attach(mxl5007t_attach, dvb->frontend,
+                                   &dev->i2c_adap, 0x60,
+                                   &mxl5007t_hvr950q_config);
+                break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
                        "isn't supported yet\n");
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 24a34fc1f2b3..ce71e8e7b835 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,9 +1,7 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
         depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 0ea559a7fe59..85bf31ab8789 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -45,6 +45,7 @@
 #include <linux/kdev_t.h>
 #include "bttvp.h"
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tvaudio.h>
 #include <media/msp3400.h>
 
@@ -163,8 +164,8 @@ MODULE_LICENSE("GPL");
 static ssize_t show_card(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
-        struct video_device *vfd = container_of(cd, struct video_device, class_dev);
-        struct bttv *btv = dev_get_drvdata(vfd->dev);
+        struct video_device *vfd = container_of(cd, struct video_device, dev);
+        struct bttv *btv = dev_get_drvdata(vfd->parent);
         return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET);
 }
 static DEVICE_ATTR(card, S_IRUGO, show_card, NULL);
@@ -3357,10 +3358,7 @@ static const struct file_operations bttv_fops =
         .poll     = bttv_poll,
 };
 
-static struct video_device bttv_video_template =
-{
-        .fops     = &bttv_fops,
-        .minor    = -1,
+static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
         .vidioc_querycap                = bttv_querycap,
         .vidioc_enum_fmt_vid_cap        = bttv_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap           = bttv_g_fmt_vid_cap,
@@ -3411,8 +3409,14 @@ static struct video_device bttv_video_template =
         .vidioc_g_register              = bttv_g_register,
         .vidioc_s_register              = bttv_s_register,
 #endif
-        .tvnorms                        = BTTV_NORMS,
-        .current_norm                   = V4L2_STD_PAL,
+};
+
+static struct video_device bttv_video_template = {
+        .fops         = &bttv_fops,
+        .minor        = -1,
+        .ioctl_ops    = &bttv_ioctl_ops,
+        .tvnorms      = BTTV_NORMS,
+        .current_norm = V4L2_STD_PAL,
 };
 
 /* ----------------------------------------------------------------------- */
@@ -3635,10 +3639,7 @@ static const struct file_operations radio_fops =
         .poll     = radio_poll,
 };
 
-static struct video_device radio_template =
-{
-        .fops     = &radio_fops,
-        .minor    = -1,
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_querycap        = radio_querycap,
         .vidioc_g_tuner         = radio_g_tuner,
         .vidioc_enum_input      = radio_enum_input,
@@ -3655,6 +3656,12 @@ static struct video_device radio_template =
         .vidioc_s_frequency     = bttv_s_frequency,
 };
 
+static struct video_device radio_template = {
+        .fops      = &radio_fops,
+        .minor     = -1,
+        .ioctl_ops = &radio_ioctl_ops,
+};
+
 /* ----------------------------------------------------------------------- */
 /* some debug code                                                         */
 
@@ -4175,8 +4182,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
 
 static struct video_device *vdev_init(struct bttv *btv,
                                       const struct video_device *template,
-                                      const char *type_name,
-                                      const int type)
+                                      const char *type_name)
 {
         struct video_device *vfd;
 
@@ -4185,9 +4191,8 @@ static struct video_device *vdev_init(struct bttv *btv,
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev     = &btv->c.pci->dev;
+        vfd->parent  = &btv->c.pci->dev;
         vfd->release = video_device_release;
-        vfd->type    = type;
         vfd->debug   = bttv_debug;
         snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
                  btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",
@@ -4223,20 +4228,11 @@ static void bttv_unregister_video(struct bttv *btv)
 /* register video4linux devices */
 static int __devinit bttv_register_video(struct bttv *btv)
 {
-        int video_type = VID_TYPE_CAPTURE |
-                         VID_TYPE_TUNER   |
-                         VID_TYPE_CLIPPING|
-                         VID_TYPE_SCALES;
-
-        if (no_overlay <= 0) {
-                bttv_video_template.type |= VID_TYPE_OVERLAY;
-        } else {
+        if (no_overlay > 0)
                 printk("bttv: Overlay support disabled.\n");
-        }
 
         /* video */
-        btv->video_dev = vdev_init(btv, &bttv_video_template,
-                                   "video", video_type);
+        btv->video_dev = vdev_init(btv, &bttv_video_template, "video");
 
         if (NULL == btv->video_dev)
                 goto err;
@@ -4244,7 +4240,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device video%d\n",
                btv->c.nr,btv->video_dev->minor & 0x1f);
-        if (device_create_file(&btv->video_dev->class_dev,
+        if (device_create_file(&btv->video_dev->dev,
                                      &dev_attr_card)<0) {
                 printk(KERN_ERR "bttv%d: device_create_file 'card' "
                        "failed\n", btv->c.nr);
@@ -4252,8 +4248,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
         }
 
         /* vbi */
-        btv->vbi_dev = vdev_init(btv, &bttv_video_template,
-                                 "vbi", VID_TYPE_TUNER | VID_TYPE_TELETEXT);
+        btv->vbi_dev = vdev_init(btv, &bttv_video_template, "vbi");
 
         if (NULL == btv->vbi_dev)
                 goto err;
@@ -4265,8 +4260,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
         if (!btv->has_radio)
                 return 0;
         /* radio */
-        btv->radio_dev = vdev_init(btv, &radio_template,
-                                   "radio", VID_TYPE_TUNER);
+        btv->radio_dev = vdev_init(btv, &radio_template, "radio");
         if (NULL == btv->radio_dev)
                 goto err;
         if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0)
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 0af586876e72..649682aac1ac 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <media/v4l2-ioctl.h>
 
 #include "bttvp.h"
 
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 68f28e5fa040..6819e21a3773 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/kdev_t.h>
+#include <media/v4l2-ioctl.h>
 #include <asm/io.h>
 #include "bttvp.h"
 
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index b364adaae78d..d3b3268bace8 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -74,6 +74,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <linux/sched.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
 
@@ -906,9 +907,7 @@ static const struct file_operations qcam_fops = {
 };
 static struct video_device qcam_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Connectix Quickcam",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
 };
 
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index fe1e67bb1ca8..fe9379b282d3 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -35,6 +35,7 @@
 #include <linux/sched.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 #include <linux/jiffies.h>
 
@@ -701,9 +702,7 @@ static const struct file_operations qcam_fops = {
 
 static struct video_device qcam_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Colour QuickCam",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
 };
 
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index d99453faaab7..c149b7d712e5 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -25,6 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/v4l2-chip-ident.h>
 #include <linux/device.h>
 #include <linux/wait.h>
@@ -1768,17 +1769,7 @@ static const struct file_operations cafe_v4l_fops = {
         .llseek = no_llseek,
 };
 
-static struct video_device cafe_v4l_template = {
-        .name = "cafe",
-        .type = VFL_TYPE_GRABBER,
-        .type2 = VID_TYPE_CAPTURE,
-        .minor = -1, /* Get one dynamically */
-        .tvnorms = V4L2_STD_NTSC_M,
-        .current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */
-
-        .fops = &cafe_v4l_fops,
-        .release = cafe_v4l_dev_release,
-
+static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {
         .vidioc_querycap        = cafe_vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap = cafe_vidioc_try_fmt_vid_cap,
@@ -1801,6 +1792,17 @@ static struct video_device cafe_v4l_template = {
         .vidioc_s_parm          = cafe_vidioc_s_parm,
 };
 
+static struct video_device cafe_v4l_template = {
+        .name = "cafe",
+        .minor = -1, /* Get one dynamically */
+        .tvnorms = V4L2_STD_NTSC_M,
+        .current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */
+
+        .fops = &cafe_v4l_fops,
+        .ioctl_ops = &cafe_v4l_ioctl_ops,
+        .release = cafe_v4l_dev_release,
+};
+
 
 
 
@@ -2157,7 +2159,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
         cam->v4ldev = cafe_v4l_template;
         cam->v4ldev.debug = 0;
 //      cam->v4ldev.debug = V4L2_DEBUG_IOCTL_ARG;
-        cam->v4ldev.dev = &pdev->dev;
+        cam->v4ldev.parent = &pdev->dev;
         ret = video_register_device(&cam->v4ldev, VFL_TYPE_GRABBER, -1);
         if (ret)
                 goto out_smbus;
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index 54de0cd482e9..bd5d9de5a008 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -17,7 +17,7 @@
 #include <linux/videodev2.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #ifdef CONFIG_COMPAT
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 2a81376ef503..dc8cc6115e2f 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3799,9 +3799,7 @@ static const struct file_operations cpia_fops = {
 };
 
 static struct video_device cpia_template = {
-        .owner          = THIS_MODULE,
         .name           = "CPiA Camera",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &cpia_fops,
 };
 
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index 5096058bf579..8f0cfee4b8a1 100644
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -46,6 +46,7 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index f2e8b1c82c66..af8b9ec8e358 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -32,6 +32,7 @@
 #include "cpia2.h"
 
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 7ce2789fa976..515c8b57a60d 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -37,6 +37,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <media/v4l2-ioctl.h>
 
 #include "cpia2.h"
 #include "cpia2dev.h"
@@ -1935,11 +1936,7 @@ static const struct file_operations fops_template = {
 
 static struct video_device cpia2_template = {
         /* I could not find any place for the old .initialize initializer?? */
-        .owner=         THIS_MODULE,
         .name=          "CPiA2 Camera",
-        .type=          VID_TYPE_CAPTURE,
-        .type2 =        V4L2_CAP_VIDEO_CAPTURE |
-                        V4L2_CAP_STREAMING,
         .minor=         -1,
         .fops=          &fops_template,
         .release=       video_device_release,
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 1c3fa3a7470a..61d14d26686f 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -111,7 +111,7 @@ static int cs5345_command(struct i2c_client *client, unsigned cmd, void *arg)
                 if (cmd == VIDIOC_DBG_G_REGISTER)
                         reg->val = cs5345_read(client, reg->reg & 0x1f);
                 else
-                        cs5345_write(client, reg->reg & 0x1f, reg->val & 0x1f);
+                        cs5345_write(client, reg->reg & 0x1f, reg->val & 0xff);
                 break;
         }
 #endif
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 645b339152d3..e30a589c0e18 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -26,7 +26,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-i2c-drv-legacy.h>
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index 9aefdc5ea79a..ef48565de7f1 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -2,9 +2,7 @@ config VIDEO_CX18
         tristate "Conexant cx23418 MPEG encoder support"
         depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
         depends on INPUT        # due to VIDEO_IR
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/cx18/cx18-av-audio.c b/drivers/media/video/cx18/cx18-av-audio.c
index c40a286de1b9..0b55837880a7 100644
--- a/drivers/media/video/cx18/cx18-av-audio.c
+++ b/drivers/media/video/cx18/cx18-av-audio.c
@@ -30,7 +30,6 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
         if (freq != 32000 && freq != 44100 && freq != 48000)
                 return -EINVAL;
 
-        /* common for all inputs and rates */
         /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x10 */
         cx18_av_write(cx, 0x127, 0x50);
 
@@ -38,15 +37,30 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                 switch (freq) {
                 case 32000:
                         /* VID_PLL and AUX_PLL */
-                        cx18_av_write4(cx, 0x108, 0x1006040f);
+                        cx18_av_write4(cx, 0x108, 0x1408040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x01bb39ee);
+                        /* 0x8.9504318a * 28,636,363.636 / 0x14 = 32000 * 384 */
+                        cx18_av_write4(cx, 0x110, 0x012a0863);
 
-                        /* src3/4/6_ctl = 0x0801f77f */
+                        /* src3/4/6_ctl */
+                        /* 0x1.f77f = (4 * 15734.26) / 32000 */
                         cx18_av_write4(cx, 0x900, 0x0801f77f);
                         cx18_av_write4(cx, 0x904, 0x0801f77f);
                         cx18_av_write4(cx, 0x90c, 0x0801f77f);
+
+                        /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x14 */
+                        cx18_av_write(cx, 0x127, 0x54);
+
+                        /* AUD_COUNT = 0x2fff = 8 samples * 4 * 384 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x11202fff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x0d2ef8 = 107999.000 * 8 =
+                         *  ((8 samples/32,000) * (13,500,000 * 8) * 4 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa10d2ef8);
                         break;
 
                 case 44100:
@@ -54,12 +68,24 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                         cx18_av_write4(cx, 0x108, 0x1009040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x00ec6bd6);
+                        /* 0x9.7635e7 * 28,636,363.63 / 0x10 = 44100 * 384 */
+                        cx18_av_write4(cx, 0x110, 0x00ec6bce);
 
-                        /* src3/4/6_ctl = 0x08016d59 */
+                        /* src3/4/6_ctl */
+                        /* 0x1.6d59 = (4 * 15734.26) / 44100 */
                         cx18_av_write4(cx, 0x900, 0x08016d59);
                         cx18_av_write4(cx, 0x904, 0x08016d59);
                         cx18_av_write4(cx, 0x90c, 0x08016d59);
+
+                        /* AUD_COUNT = 0x92ff = 49 samples * 2 * 384 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x112092ff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x1d4bf8 = 239999.000 * 8 =
+                         *  ((49 samples/44,100) * (13,500,000 * 8) * 2 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa11d4bf8);
                         break;
 
                 case 48000:
@@ -67,12 +93,24 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                         cx18_av_write4(cx, 0x108, 0x100a040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x0098d6e5);
+                        /* 0xa.4c6b6ea * 28,636,363.63 / 0x10 = 48000 * 384 */
+                        cx18_av_write4(cx, 0x110, 0x0098d6dd);
 
-                        /* src3/4/6_ctl = 0x08014faa */
+                        /* src3/4/6_ctl */
+                        /* 0x1.4faa = (4 * 15734.26) / 48000 */
                         cx18_av_write4(cx, 0x900, 0x08014faa);
                         cx18_av_write4(cx, 0x904, 0x08014faa);
                         cx18_av_write4(cx, 0x90c, 0x08014faa);
+
+                        /* AUD_COUNT = 0x5fff = 4 samples * 16 * 384 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x11205fff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x1193f8 = 143999.000 * 8 =
+                         *  ((4 samples/48,000) * (13,500,000 * 8) * 16 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa11193f8);
                         break;
                 }
         } else {
@@ -82,18 +120,31 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                         cx18_av_write4(cx, 0x108, 0x1e08040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x012a0869);
+                        /* 0x8.9504318 * 28,636,363.63 / 0x1e = 32000 * 256 */
+                        cx18_av_write4(cx, 0x110, 0x012a0863);
 
-                        /* src1_ctl = 0x08010000 */
+                        /* src1_ctl */
+                        /* 0x1.0000 = 32000/32000 */
                         cx18_av_write4(cx, 0x8f8, 0x08010000);
 
-                        /* src3/4/6_ctl = 0x08020000 */
+                        /* src3/4/6_ctl */
+                        /* 0x2.0000 = 2 * (32000/32000) */
                         cx18_av_write4(cx, 0x900, 0x08020000);
                         cx18_av_write4(cx, 0x904, 0x08020000);
                         cx18_av_write4(cx, 0x90c, 0x08020000);
 
                         /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x14 */
                         cx18_av_write(cx, 0x127, 0x54);
+
+                        /* AUD_COUNT = 0x1fff = 8 samples * 4 * 256 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x11201fff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x0d2ef8 = 107999.000 * 8 =
+                         *  ((8 samples/32,000) * (13,500,000 * 8) * 4 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa10d2ef8);
                         break;
 
                 case 44100:
@@ -101,15 +152,28 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                         cx18_av_write4(cx, 0x108, 0x1809040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x00ec6bd6);
+                        /* 0x9.7635e74 * 28,636,363.63 / 0x18 = 44100 * 256 */
+                        cx18_av_write4(cx, 0x110, 0x00ec6bce);
 
-                        /* src1_ctl = 0x08010000 */
+                        /* src1_ctl */
+                        /* 0x1.60cd = 44100/32000 */
                         cx18_av_write4(cx, 0x8f8, 0x080160cd);
 
-                        /* src3/4/6_ctl = 0x08020000 */
+                        /* src3/4/6_ctl */
+                        /* 0x1.7385 = 2 * (32000/44100) */
                         cx18_av_write4(cx, 0x900, 0x08017385);
                         cx18_av_write4(cx, 0x904, 0x08017385);
                         cx18_av_write4(cx, 0x90c, 0x08017385);
+
+                        /* AUD_COUNT = 0x61ff = 49 samples * 2 * 256 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x112061ff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x1d4bf8 = 239999.000 * 8 =
+                         *  ((49 samples/44,100) * (13,500,000 * 8) * 2 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa11d4bf8);
                         break;
 
                 case 48000:
@@ -117,15 +181,28 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
                         cx18_av_write4(cx, 0x108, 0x180a040f);
 
                         /* AUX_PLL_FRAC */
-                        cx18_av_write4(cx, 0x110, 0x0098d6e5);
+                        /* 0xa.4c6b6ea * 28,636,363.63 / 0x18 = 48000 * 256 */
+                        cx18_av_write4(cx, 0x110, 0x0098d6dd);
 
-                        /* src1_ctl = 0x08010000 */
+                        /* src1_ctl */
+                        /* 0x1.8000 = 48000/32000 */
                         cx18_av_write4(cx, 0x8f8, 0x08018000);
 
-                        /* src3/4/6_ctl = 0x08020000 */
+                        /* src3/4/6_ctl */
+                        /* 0x1.5555 = 2 * (32000/48000) */
                         cx18_av_write4(cx, 0x900, 0x08015555);
                         cx18_av_write4(cx, 0x904, 0x08015555);
                         cx18_av_write4(cx, 0x90c, 0x08015555);
+
+                        /* AUD_COUNT = 0x3fff = 4 samples * 16 * 256 - 1 */
+                        cx18_av_write4(cx, 0x12c, 0x11203fff);
+
+                        /*
+                         * EN_AV_LOCK = 1
+                         * VID_COUNT = 0x1193f8 = 143999.000 * 8 =
+                         *  ((4 samples/48,000) * (13,500,000 * 8) * 16 - 1) * 8
+                         */
+                        cx18_av_write4(cx, 0x128, 0xa11193f8);
                         break;
                 }
         }
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 45e31b04730e..4801bc7fb5b2 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -46,6 +46,7 @@
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
 #include "cx18-mailbox.h"
 #include "cx18-av-core.h"
diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
index 2d630d9f7496..78fadd2ada5d 100644
--- a/drivers/media/video/cx18/cx18-firmware.c
+++ b/drivers/media/video/cx18/cx18-firmware.c
@@ -86,10 +86,6 @@
 
 #define CX18_DSP0_INTERRUPT_MASK        0xd0004C
 
-/* Encoder/decoder firmware sizes */
-#define CX18_FW_CPU_SIZE                (158332)
-#define CX18_FW_APU_SIZE                (141200)
-
 #define APU_ROM_SYNC1 0x6D676553 /* "mgeS" */
 #define APU_ROM_SYNC2 0x72646548 /* "rdeH" */
 
@@ -100,35 +96,22 @@ struct cx18_apu_rom_seghdr {
         u32 size;
 };
 
-static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx, long size)
+static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx)
 {
         const struct firmware *fw = NULL;
-        int retries = 3;
         int i, j;
+        unsigned size;
         u32 __iomem *dst = (u32 __iomem *)mem;
         const u32 *src;
 
-retry:
-        if (!retries || request_firmware(&fw, fn, &cx->dev->dev)) {
-                CX18_ERR("Unable to open firmware %s (must be %ld bytes)\n",
-                                fn, size);
+        if (request_firmware(&fw, fn, &cx->dev->dev)) {
+                CX18_ERR("Unable to open firmware %s\n", fn);
                 CX18_ERR("Did you put the firmware in the hotplug firmware directory?\n");
                 return -ENOMEM;
         }
 
         src = (const u32 *)fw->data;
 
-        if (fw->size != size) {
-                /* Due to race conditions in firmware loading (esp. with
-                   udev <0.95) the wrong file was sometimes loaded. So we check
-                   filesizes to see if at least the right-sized file was
-                   loaded. If not, then we retry. */
-                CX18_INFO("retry: file loaded was not %s (expected size %ld, got %zd)\n",
-                                fn, size, fw->size);
-                release_firmware(fw);
-                retries--;
-                goto retry;
-        }
         for (i = 0; i < fw->size; i += 4096) {
                 setup_page(i);
                 for (j = i; j < fw->size && j < i + 4096; j += 4) {
@@ -145,15 +128,16 @@ retry:
         }
         if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags))
                 CX18_INFO("loaded %s firmware (%zd bytes)\n", fn, fw->size);
+        size = fw->size;
         release_firmware(fw);
         return size;
 }
 
-static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx, long size)
+static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)
 {
         const struct firmware *fw = NULL;
-        int retries = 3;
         int i, j;
+        unsigned size;
         const u32 *src;
         struct cx18_apu_rom_seghdr seghdr;
         const u8 *vers;
@@ -161,10 +145,8 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx,
         u32 apu_version = 0;
         int sz;
 
-retry:
-        if (!retries || request_firmware(&fw, fn, &cx->dev->dev)) {
-                CX18_ERR("unable to open firmware %s (must be %ld bytes)\n",
-                                fn, size);
+        if (request_firmware(&fw, fn, &cx->dev->dev)) {
+                CX18_ERR("unable to open firmware %s\n", fn);
                 CX18_ERR("did you put the firmware in the hotplug firmware directory?\n");
                 return -ENOMEM;
         }
@@ -173,19 +155,8 @@ retry:
         vers = fw->data + sizeof(seghdr);
         sz = fw->size;
 
-        if (fw->size != size) {
-                /* Due to race conditions in firmware loading (esp. with
-                   udev <0.95) the wrong file was sometimes loaded. So we check
-                   filesizes to see if at least the right-sized file was
-                   loaded. If not, then we retry. */
-                CX18_INFO("retry: file loaded was not %s (expected size %ld, got %zd)\n",
-                               fn, size, fw->size);
-                release_firmware(fw);
-                retries--;
-                goto retry;
-        }
         apu_version = (vers[0] << 24) | (vers[4] << 16) | vers[32];
-        while (offset + sizeof(seghdr) < size) {
+        while (offset + sizeof(seghdr) < fw->size) {
                 /* TODO: byteswapping */
                 memcpy(&seghdr, src + offset / 4, sizeof(seghdr));
                 offset += sizeof(seghdr);
@@ -215,6 +186,7 @@ retry:
         if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags))
                 CX18_INFO("loaded %s firmware V%08x (%zd bytes)\n",
                                 fn, apu_version, fw->size);
+        size = fw->size;
         release_firmware(fw);
         /* Clear bit0 for APU to start from 0 */
         write_reg(read_reg(0xc72030) & ~1, 0xc72030);
@@ -340,7 +312,7 @@ int cx18_firmware_init(struct cx18 *cx)
         /* Only if the processor is not running */
         if (read_reg(CX18_PROC_SOFT_RESET) & 8) {
                 int sz = load_apu_fw_direct("v4l-cx23418-apu.fw",
-                               cx->enc_mem, cx, CX18_FW_APU_SIZE);
+                               cx->enc_mem, cx);
 
                 write_enc(0xE51FF004, 0);
                 write_enc(0xa00000, 4);  /* todo: not hardcoded */
@@ -348,7 +320,7 @@ int cx18_firmware_init(struct cx18 *cx)
                 cx18_msleep_timeout(500, 0);
 
                 sz = sz <= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw",
-                                        cx->enc_mem, cx, CX18_FW_CPU_SIZE);
+                                        cx->enc_mem, cx);
 
                 if (sz > 0) {
                         int retries = 0;
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 0d74e59e503e..a7f839631d6a 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -787,50 +787,54 @@ int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
         return res;
 }
 
-void cx18_set_funcs(struct video_device *vdev)
-{
-        vdev->vidioc_querycap                = cx18_querycap;
-        vdev->vidioc_g_priority              = cx18_g_priority;
-        vdev->vidioc_s_priority              = cx18_s_priority;
-        vdev->vidioc_s_audio                 = cx18_s_audio;
-        vdev->vidioc_g_audio                 = cx18_g_audio;
-        vdev->vidioc_enumaudio               = cx18_enumaudio;
-        vdev->vidioc_enum_input              = cx18_enum_input;
-        vdev->vidioc_cropcap                 = cx18_cropcap;
-        vdev->vidioc_s_crop                  = cx18_s_crop;
-        vdev->vidioc_g_crop                  = cx18_g_crop;
-        vdev->vidioc_g_input                 = cx18_g_input;
-        vdev->vidioc_s_input                 = cx18_s_input;
-        vdev->vidioc_g_frequency             = cx18_g_frequency;
-        vdev->vidioc_s_frequency             = cx18_s_frequency;
-        vdev->vidioc_s_tuner                 = cx18_s_tuner;
-        vdev->vidioc_g_tuner                 = cx18_g_tuner;
-        vdev->vidioc_g_enc_index             = cx18_g_enc_index;
-        vdev->vidioc_g_std                   = cx18_g_std;
-        vdev->vidioc_s_std                   = cx18_s_std;
-        vdev->vidioc_log_status              = cx18_log_status;
-        vdev->vidioc_enum_fmt_vid_cap        = cx18_enum_fmt_vid_cap;
-        vdev->vidioc_encoder_cmd             = cx18_encoder_cmd;
-        vdev->vidioc_try_encoder_cmd         = cx18_try_encoder_cmd;
-        vdev->vidioc_g_fmt_vid_cap           = cx18_g_fmt_vid_cap;
-        vdev->vidioc_g_fmt_vbi_cap           = cx18_g_fmt_vbi_cap;
-        vdev->vidioc_g_fmt_sliced_vbi_cap    = cx18_g_fmt_sliced_vbi_cap;
-        vdev->vidioc_s_fmt_vid_cap           = cx18_s_fmt_vid_cap;
-        vdev->vidioc_s_fmt_vbi_cap           = cx18_s_fmt_vbi_cap;
-        vdev->vidioc_s_fmt_sliced_vbi_cap    = cx18_s_fmt_sliced_vbi_cap;
-        vdev->vidioc_try_fmt_vid_cap         = cx18_try_fmt_vid_cap;
-        vdev->vidioc_try_fmt_vbi_cap         = cx18_try_fmt_vbi_cap;
-        vdev->vidioc_try_fmt_sliced_vbi_cap  = cx18_try_fmt_sliced_vbi_cap;
-        vdev->vidioc_g_sliced_vbi_cap        = cx18_g_sliced_vbi_cap;
-        vdev->vidioc_g_chip_ident            = cx18_g_chip_ident;
+static const struct v4l2_ioctl_ops cx18_ioctl_ops = {
+        .vidioc_querycap                = cx18_querycap,
+        .vidioc_g_priority              = cx18_g_priority,
+        .vidioc_s_priority              = cx18_s_priority,
+        .vidioc_s_audio                 = cx18_s_audio,
+        .vidioc_g_audio                 = cx18_g_audio,
+        .vidioc_enumaudio               = cx18_enumaudio,
+        .vidioc_enum_input              = cx18_enum_input,
+        .vidioc_cropcap                 = cx18_cropcap,
+        .vidioc_s_crop                  = cx18_s_crop,
+        .vidioc_g_crop                  = cx18_g_crop,
+        .vidioc_g_input                 = cx18_g_input,
+        .vidioc_s_input                 = cx18_s_input,
+        .vidioc_g_frequency             = cx18_g_frequency,
+        .vidioc_s_frequency             = cx18_s_frequency,
+        .vidioc_s_tuner                 = cx18_s_tuner,
+        .vidioc_g_tuner                 = cx18_g_tuner,
+        .vidioc_g_enc_index             = cx18_g_enc_index,
+        .vidioc_g_std                   = cx18_g_std,
+        .vidioc_s_std                   = cx18_s_std,
+        .vidioc_log_status              = cx18_log_status,
+        .vidioc_enum_fmt_vid_cap        = cx18_enum_fmt_vid_cap,
+        .vidioc_encoder_cmd             = cx18_encoder_cmd,
+        .vidioc_try_encoder_cmd         = cx18_try_encoder_cmd,
+        .vidioc_g_fmt_vid_cap           = cx18_g_fmt_vid_cap,
+        .vidioc_g_fmt_vbi_cap           = cx18_g_fmt_vbi_cap,
+        .vidioc_g_fmt_sliced_vbi_cap    = cx18_g_fmt_sliced_vbi_cap,
+        .vidioc_s_fmt_vid_cap           = cx18_s_fmt_vid_cap,
+        .vidioc_s_fmt_vbi_cap           = cx18_s_fmt_vbi_cap,
+        .vidioc_s_fmt_sliced_vbi_cap    = cx18_s_fmt_sliced_vbi_cap,
+        .vidioc_try_fmt_vid_cap         = cx18_try_fmt_vid_cap,
+        .vidioc_try_fmt_vbi_cap         = cx18_try_fmt_vbi_cap,
+        .vidioc_try_fmt_sliced_vbi_cap  = cx18_try_fmt_sliced_vbi_cap,
+        .vidioc_g_sliced_vbi_cap        = cx18_g_sliced_vbi_cap,
+        .vidioc_g_chip_ident            = cx18_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        vdev->vidioc_g_register              = cx18_g_register;
-        vdev->vidioc_s_register              = cx18_s_register;
+        .vidioc_g_register              = cx18_g_register,
+        .vidioc_s_register              = cx18_s_register,
 #endif
-        vdev->vidioc_default                 = cx18_default;
-        vdev->vidioc_queryctrl               = cx18_queryctrl;
-        vdev->vidioc_querymenu               = cx18_querymenu;
-        vdev->vidioc_g_ext_ctrls             = cx18_g_ext_ctrls;
-        vdev->vidioc_s_ext_ctrls             = cx18_s_ext_ctrls;
-        vdev->vidioc_try_ext_ctrls           = cx18_try_ext_ctrls;
+        .vidioc_default                 = cx18_default,
+        .vidioc_queryctrl               = cx18_queryctrl,
+        .vidioc_querymenu               = cx18_querymenu,
+        .vidioc_g_ext_ctrls             = cx18_g_ext_ctrls,
+        .vidioc_s_ext_ctrls             = cx18_s_ext_ctrls,
+        .vidioc_try_ext_ctrls           = cx18_try_ext_ctrls,
+};
+
+void cx18_set_funcs(struct video_device *vdev)
+{
+        vdev->ioctl_ops = &cx18_ioctl_ops;
 }
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 1728b1d832a9..0da57f583bf7 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -187,14 +187,11 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
                 return -ENOMEM;
         }
 
-        s->v4l2dev->type =
-                VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT |
-                VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER;
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d",
                         cx->num);
 
         s->v4l2dev->minor = minor;
-        s->v4l2dev->dev = &cx->dev->dev;
+        s->v4l2dev->parent = &cx->dev->dev;
         s->v4l2dev->fops = cx18_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
         s->v4l2dev->tvnorms = V4L2_STD_ALL;
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 5cfb46bbdaa9..e60bd31b51a3 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -1,9 +1,7 @@
 config VIDEO_CX23885
         tristate "Conexant cx23885 (2388x successor) support"
         depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_BTCX
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index e7ef093265af..8118091568fc 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/cx2341x.h>
 
 #include "cx23885.h"
@@ -1699,14 +1700,7 @@ static struct file_operations mpeg_fops = {
         .llseek        = no_llseek,
 };
 
-static struct video_device cx23885_mpeg_template = {
-        .name          = "cx23885",
-        .type          = VID_TYPE_CAPTURE |
-                                VID_TYPE_TUNER |
-                                VID_TYPE_SCALES |
-                                VID_TYPE_MPEG_ENCODER,
-        .fops          = &mpeg_fops,
-        .minor         = -1,
+static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
         .vidioc_s_std            = vidioc_s_std,
         .vidioc_enum_input       = vidioc_enum_input,
         .vidioc_g_input          = vidioc_g_input,
@@ -1735,6 +1729,13 @@ static struct video_device cx23885_mpeg_template = {
         .vidioc_queryctrl        = vidioc_queryctrl,
 };
 
+static struct video_device cx23885_mpeg_template = {
+        .name          = "cx23885",
+        .fops          = &mpeg_fops,
+        .ioctl_ops     = &mpeg_ioctl_ops,
+        .minor         = -1,
+};
+
 void cx23885_417_unregister(struct cx23885_dev *dev)
 {
         dprintk(1, "%s()\n", __func__);
@@ -1766,7 +1767,7 @@ static struct video_device *cx23885_video_dev_alloc(
         vfd->minor   = -1;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name,
                 type, cx23885_boards[tsport->dev->board].name);
-        vfd->dev     = &pci->dev;
+        vfd->parent  = &pci->dev;
         vfd->release = video_device_release;
         return vfd;
 }
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index fd7112c11d35..a19de850955d 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -145,6 +145,7 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP] = {
                 .name           = "DViCO FusionHDTV7 Dual Express",
+                .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
 };
@@ -325,25 +326,41 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
 {
         struct cx23885_i2c *bus = priv;
         struct cx23885_dev *dev = bus->dev;
+        u32 bitmask = 0;
+
+        if (command != 0) {
+                printk(KERN_ERR "%s(): Unknown command 0x%x.\n",
+                        __func__, command);
+                return -EINVAL;
+        }
 
         switch(dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-                if(command == 0) {      /* Tuner Reset Command from xc5000 */
-                        /* Drive the tuner into reset and out */
-                        cx_clear(GP0_IO, 0x00000004);
-                        mdelay(200);
-                        cx_set(GP0_IO, 0x00000004);
-                        return 0;
-                }
-                else {
-                        printk(KERN_ERR
-                                "%s(): Unknow command.\n", __func__);
-                        return -EINVAL;
+                /* Tuner Reset Command from xc5000 */
+                if (command == 0)
+                        bitmask = 0x04;
+                break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+                if (command == 0) {
+
+                        /* Two identical tuners on two different i2c buses,
+                         * we need to reset the correct gpio. */
+                        if (bus->nr == 0)
+                                bitmask = 0x01;
+                        else if (bus->nr == 1)
+                                bitmask = 0x04;
                 }
                 break;
         }
 
-        return 0; /* Should never be here */
+        if (bitmask) {
+                /* Drive the tuner into reset and back out */
+                cx_clear(GP0_IO, bitmask);
+                mdelay(200);
+                cx_set(GP0_IO, bitmask);
+        }
+
+        return 0;
 }
 
 void cx23885_gpio_setup(struct cx23885_dev *dev)
@@ -435,6 +452,19 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(20);
                 cx_set(GP0_IO, 0x00050005);
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+                /* GPIO-0 xc5000 tuner reset i2c bus 0 */
+                /* GPIO-1 s5h1409 demod reset i2c bus 0 */
+                /* GPIO-2 xc5000 tuner reset i2c bus 1 */
+                /* GPIO-3 s5h1409 demod reset i2c bus 0 */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x000f0000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x0000000f);
+                mdelay(20);
+                cx_set(GP0_IO, 0x000f000f);
+                break;
         }
 }
 
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index d17343ea0d33..6286a9cf957e 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -76,6 +76,117 @@ LIST_HEAD(cx23885_devlist);
  * 0x00010ea0 0x00010xxx Free
  */
 
+static struct sram_channel cx23885_sram_channels[] = {
+        [SRAM_CH01] = {
+                .name           = "VID A",
+                .cmds_start     = 0x10000,
+                .ctrl_start     = 0x10380,
+                .cdt            = 0x104c0,
+                .fifo_start     = 0x40,
+                .fifo_size      = 0x2800,
+                .ptr1_reg       = DMA1_PTR1,
+                .ptr2_reg       = DMA1_PTR2,
+                .cnt1_reg       = DMA1_CNT1,
+                .cnt2_reg       = DMA1_CNT2,
+        },
+        [SRAM_CH02] = {
+                .name           = "ch2",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA2_PTR1,
+                .ptr2_reg       = DMA2_PTR2,
+                .cnt1_reg       = DMA2_CNT1,
+                .cnt2_reg       = DMA2_CNT2,
+        },
+        [SRAM_CH03] = {
+                .name           = "TS1 B",
+                .cmds_start     = 0x100A0,
+                .ctrl_start     = 0x10400,
+                .cdt            = 0x10580,
+                .fifo_start     = 0x5000,
+                .fifo_size      = 0x1000,
+                .ptr1_reg       = DMA3_PTR1,
+                .ptr2_reg       = DMA3_PTR2,
+                .cnt1_reg       = DMA3_CNT1,
+                .cnt2_reg       = DMA3_CNT2,
+        },
+        [SRAM_CH04] = {
+                .name           = "ch4",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA4_PTR1,
+                .ptr2_reg       = DMA4_PTR2,
+                .cnt1_reg       = DMA4_CNT1,
+                .cnt2_reg       = DMA4_CNT2,
+        },
+        [SRAM_CH05] = {
+                .name           = "ch5",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA5_PTR1,
+                .ptr2_reg       = DMA5_PTR2,
+                .cnt1_reg       = DMA5_CNT1,
+                .cnt2_reg       = DMA5_CNT2,
+        },
+        [SRAM_CH06] = {
+                .name           = "TS2 C",
+                .cmds_start     = 0x10140,
+                .ctrl_start     = 0x10440,
+                .cdt            = 0x105e0,
+                .fifo_start     = 0x6000,
+                .fifo_size      = 0x1000,
+                .ptr1_reg       = DMA5_PTR1,
+                .ptr2_reg       = DMA5_PTR2,
+                .cnt1_reg       = DMA5_CNT1,
+                .cnt2_reg       = DMA5_CNT2,
+        },
+        [SRAM_CH07] = {
+                .name           = "ch7",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA6_PTR1,
+                .ptr2_reg       = DMA6_PTR2,
+                .cnt1_reg       = DMA6_CNT1,
+                .cnt2_reg       = DMA6_CNT2,
+        },
+        [SRAM_CH08] = {
+                .name           = "ch8",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA7_PTR1,
+                .ptr2_reg       = DMA7_PTR2,
+                .cnt1_reg       = DMA7_CNT1,
+                .cnt2_reg       = DMA7_CNT2,
+        },
+        [SRAM_CH09] = {
+                .name           = "ch9",
+                .cmds_start     = 0x0,
+                .ctrl_start     = 0x0,
+                .cdt            = 0x0,
+                .fifo_start     = 0x0,
+                .fifo_size      = 0x0,
+                .ptr1_reg       = DMA8_PTR1,
+                .ptr2_reg       = DMA8_PTR2,
+                .cnt1_reg       = DMA8_CNT1,
+                .cnt2_reg       = DMA8_CNT2,
+        },
+};
+
 static struct sram_channel cx23887_sram_channels[] = {
         [SRAM_CH01] = {
                 .name           = "VID A",
@@ -104,8 +215,8 @@ static struct sram_channel cx23887_sram_channels[] = {
         [SRAM_CH03] = {
                 .name           = "TS1 B",
                 .cmds_start     = 0x100A0,
-                .ctrl_start     = 0x10780,
-                .cdt            = 0x10400,
+                .ctrl_start     = 0x10630,
+                .cdt            = 0x10870,
                 .fifo_start     = 0x5000,
                 .fifo_size      = 0x1000,
                 .ptr1_reg       = DMA3_PTR1,
@@ -140,7 +251,7 @@ static struct sram_channel cx23887_sram_channels[] = {
         [SRAM_CH06] = {
                 .name           = "TS2 C",
                 .cmds_start     = 0x10140,
-                .ctrl_start     = 0x10680,
+                .ctrl_start     = 0x10670,
                 .cdt            = 0x108d0,
                 .fifo_start     = 0x6000,
                 .fifo_size      = 0x1000,
@@ -460,6 +571,7 @@ static void cx23885_reset(struct cx23885_dev *dev)
         cx_write(AUDIO_INT_INT_STAT, 0xffffffff);
         cx_write(AUDIO_EXT_INT_STAT, 0xffffffff);
         cx_write(CLK_DELAY, cx_read(CLK_DELAY) & 0x80000000);
+        cx_write(PAD_CTRL, 0x00500300);
 
         mdelay(100);
 
@@ -625,7 +737,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         atomic_inc(&dev->refcount);
 
         dev->nr = cx23885_devcount++;
-        dev->sram_channels = cx23887_sram_channels;
         sprintf(dev->name, "cx23885[%d]", dev->nr);
 
         mutex_lock(&devlist);
@@ -637,11 +748,13 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                 dev->bridge = CX23885_BRIDGE_887;
                 /* Apply a sensible clock frequency for the PCIe bridge */
                 dev->clk_freq = 25000000;
+                dev->sram_channels = cx23887_sram_channels;
         } else
         if(dev->pci->device == 0x8852) {
                 dev->bridge = CX23885_BRIDGE_885;
                 /* Apply a sensible clock frequency for the PCIe bridge */
                 dev->clk_freq = 28000000;
+                dev->sram_channels = cx23885_sram_channels;
         } else
                 BUG();
 
@@ -1010,8 +1123,9 @@ static void cx23885_tsport_reg_dump(struct cx23885_tsport *port)
                 port->reg_gpcnt_ctl, cx_read(port->reg_gpcnt_ctl));
         dprintk(1, "%s() dma_ctl(0x%08X)        0x%08x\n", __func__,
                 port->reg_dma_ctl, cx_read(port->reg_dma_ctl));
-        dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __func__,
-                port->reg_src_sel, cx_read(port->reg_src_sel));
+        if (port->reg_src_sel)
+                dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __func__,
+                        port->reg_src_sel, cx_read(port->reg_src_sel));
         dprintk(1, "%s() lngth(0x%08X)          0x%08x\n", __func__,
                 port->reg_lngth, cx_read(port->reg_lngth));
         dprintk(1, "%s() hw_sop_ctrl(0x%08X)    0x%08x\n", __func__,
@@ -1042,6 +1156,9 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         dprintk(1, "%s() w: %d, h: %d, f: %d\n", __func__,
                 buf->vb.width, buf->vb.height, buf->vb.field);
 
+        /* Stop the fifo and risc engine for this port */
+        cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
+
         /* setup fifo + format */
         cx23885_sram_channel_setup(dev,
                                    &dev->sram_channels[ port->sram_chno ],
@@ -1083,7 +1200,21 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         cx_write(port->reg_gpcnt_ctl, 3);
         q->count = 1;
 
-        if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {
+        /* Set VIDB pins to input */
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {
+                reg = cx_read(PAD_CTRL);
+                reg &= ~0x3; /* Clear TS1_OE & TS1_SOP_OE */
+                cx_write(PAD_CTRL, reg);
+        }
+
+        /* Set VIDC pins to input */
+        if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {
+                reg = cx_read(PAD_CTRL);
+                reg &= ~0x4; /* Clear TS2_SOP_OE */
+                cx_write(PAD_CTRL, reg);
+        }
+
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER) {
 
                 reg = cx_read(PAD_CTRL);
                 reg = reg & ~0x1;    /* Clear TS1_OE */
@@ -1133,7 +1264,7 @@ static int cx23885_stop_dma(struct cx23885_tsport *port)
         cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);
         cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
 
-        if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER) {
 
                 reg = cx_read(PAD_CTRL);
 
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 043fc4e5c586..ad2235dab5b1 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -33,6 +33,7 @@
 
 #include "cx23885.h"
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
@@ -326,7 +327,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev     = &pci->dev;
+        vfd->parent  = &pci->dev;
         vfd->release = video_device_release;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  dev->name, type, cx23885_boards[dev->board].name);
@@ -1433,12 +1434,7 @@ static const struct file_operations video_fops = {
         .llseek        = no_llseek,
 };
 
-static struct video_device cx23885_vbi_template;
-static struct video_device cx23885_video_template = {
-        .name                 = "cx23885-video",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
-        .fops                 = &video_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
@@ -1471,6 +1467,14 @@ static struct video_device cx23885_video_template = {
         .vidioc_g_register    = vidioc_g_register,
         .vidioc_s_register    = vidioc_s_register,
 #endif
+};
+
+static struct video_device cx23885_vbi_template;
+static struct video_device cx23885_video_template = {
+        .name                 = "cx23885-video",
+        .fops                 = &video_fops,
+        .minor                = -1,
+        .ioctl_ops            = &video_ioctl_ops,
         .tvnorms              = CX23885_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
 };
@@ -1512,7 +1516,6 @@ int cx23885_video_register(struct cx23885_dev *dev)
         memcpy(&cx23885_vbi_template, &cx23885_video_template,
                 sizeof(cx23885_vbi_template));
         strcpy(cx23885_vbi_template.name, "cx23885-vbi");
-        cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
 
         dev->tvnorm = cx23885_video_template.current_norm;
 
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
index 448f4cd0ce34..de515dadadc2 100644
--- a/drivers/media/video/cx25840/Kconfig
+++ b/drivers/media/video/cx25840/Kconfig
@@ -1,8 +1,6 @@
 config VIDEO_CX25840
         tristate "Conexant CX2584x audio/video decoders"
         depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-        depends on HOTPLUG # due to FW_LOADER
-        select FW_LOADER
         ---help---
           Support for the Conexant CX2584x audio/video decoders.
 
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index e7bf4f4c1319..209d3bcb5dbb 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -50,7 +50,7 @@ MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
 
-int cx25840_debug;
+static int cx25840_debug;
 
 module_param_named(debug,cx25840_debug, int, 0644);
 
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index 72916ba975a8..b87337e590b4 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -24,8 +24,6 @@
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 
-extern int cx25840_debug;
-
 /* ENABLE_PVR150_WORKAROUND activates a workaround for a hardware bug that is
    present in Hauppauge PVR-150 (and possibly PVR-500) cards that have
    certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 10e20d8196dc..9dd7bdf659b9 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -33,9 +33,8 @@ config VIDEO_CX88_ALSA
 
 config VIDEO_CX88_BLACKBIRD
         tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
-        depends on VIDEO_CX88 && HOTPLUG
+        depends on VIDEO_CX88
         select VIDEO_CX2341X
-        select FW_LOADER
         ---help---
           This adds support for MPEG encoder cards based on the
           Blackbird reference design, using the Conexant 2388x
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index bfdca5847764..9a1374a38ec7 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -33,6 +33,7 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/cx2341x.h>
 
 #include "cx88.h"
@@ -1174,12 +1175,7 @@ static const struct file_operations mpeg_fops =
         .llseek        = no_llseek,
 };
 
-static struct video_device cx8802_mpeg_template =
-{
-        .name                 = "cx8802",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES|VID_TYPE_MPEG_ENCODER,
-        .fops                 = &mpeg_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
         .vidioc_querymenu     = vidioc_querymenu,
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
@@ -1207,6 +1203,13 @@ static struct video_device cx8802_mpeg_template =
         .vidioc_g_tuner       = vidioc_g_tuner,
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_s_std         = vidioc_s_std,
+};
+
+static struct video_device cx8802_mpeg_template = {
+        .name                 = "cx8802",
+        .fops                 = &mpeg_fops,
+        .ioctl_ops            = &mpeg_ioctl_ops,
+        .minor                = -1,
         .tvnorms              = CX88_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
 };
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index fa6d398e97b9..de199a206a15 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1348,7 +1348,7 @@ static const struct cx88_board cx88_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .audio_chip     = AUDIO_CHIP_WM8775,
+                .audio_chip     = V4L2_IDENT_WM8775,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 60eeda3057e9..d656fec59010 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -40,6 +40,7 @@
 
 #include "cx88.h"
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
@@ -1006,7 +1007,7 @@ struct video_device *cx88_vdev_init(struct cx88_core *core,
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev     = &pci->dev;
+        vfd->parent  = &pci->dev;
         vfd->release = video_device_release;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  core->name, type, core->board.name);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 0fed5cd2ccea..ef4d56ea0027 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -39,6 +39,7 @@
 
 #include "cx88.h"
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
@@ -447,7 +448,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                    the initialization. Some boards may use different
                    routes for different inputs. HVR-1300 surely does */
                 if (core->board.audio_chip &&
-                    core->board.audio_chip == AUDIO_CHIP_WM8775) {
+                    core->board.audio_chip == V4L2_IDENT_WM8775) {
                         struct v4l2_routing route;
 
                         route.input = INPUT(input).audioroute;
@@ -1682,13 +1683,7 @@ static const struct file_operations video_fops =
         .llseek        = no_llseek,
 };
 
-static struct video_device cx8800_vbi_template;
-static struct video_device cx8800_video_template =
-{
-        .name                 = "cx8800-video",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
-        .fops                 = &video_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
@@ -1721,6 +1716,15 @@ static struct video_device cx8800_video_template =
         .vidioc_g_register    = vidioc_g_register,
         .vidioc_s_register    = vidioc_s_register,
 #endif
+};
+
+static struct video_device cx8800_vbi_template;
+
+static struct video_device cx8800_video_template = {
+        .name                 = "cx8800-video",
+        .fops                 = &video_fops,
+        .minor                = -1,
+        .ioctl_ops            = &video_ioctl_ops,
         .tvnorms              = CX88_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
 };
@@ -1735,12 +1739,7 @@ static const struct file_operations radio_fops =
         .llseek        = no_llseek,
 };
 
-static struct video_device cx8800_radio_template =
-{
-        .name                 = "cx8800-radio",
-        .type                 = VID_TYPE_TUNER,
-        .fops                 = &radio_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_querycap      = radio_querycap,
         .vidioc_g_tuner       = radio_g_tuner,
         .vidioc_enum_input    = radio_enum_input,
@@ -1759,6 +1758,13 @@ static struct video_device cx8800_radio_template =
 #endif
 };
 
+static struct video_device cx8800_radio_template = {
+        .name                 = "cx8800-radio",
+        .fops                 = &radio_fops,
+        .minor                = -1,
+        .ioctl_ops            = &radio_ioctl_ops,
+};
+
 /* ----------------------------------------------------------- */
 
 static void cx8800_unregister_video(struct cx8800_dev *dev)
@@ -1830,7 +1836,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         memcpy( &cx8800_vbi_template, &cx8800_video_template,
                 sizeof(cx8800_vbi_template) );
         strcpy(cx8800_vbi_template.name,"cx8800-vbi");
-        cx8800_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
 
         /* initialize driver struct */
         spin_lock_init(&dev->slock);
@@ -1866,7 +1871,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
         /* load and configure helper modules */
 
-        if (core->board.audio_chip == AUDIO_CHIP_WM8775)
+        if (core->board.audio_chip == V4L2_IDENT_WM8775)
                 request_module("wm8775");
 
         switch (core->boardnr) {
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 14ac173f4071..54fe65094711 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -29,8 +29,8 @@
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
+#include <media/v4l2-chip-ident.h>
 #include <media/cx2341x.h>
-#include <media/audiochip.h>
 #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
 #include <media/videobuf-dvb.h>
 #endif
@@ -252,7 +252,7 @@ struct cx88_board {
         struct cx88_input       input[MAX_CX88_INPUT];
         struct cx88_input       radio;
         enum cx88_board_type    mpeg;
-        enum audiochip          audio_chip;
+        unsigned int            audio_chip;
 };
 
 struct cx88_subid {
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 05f0d5a15058..476ae44a62d2 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -32,8 +32,8 @@
 #include <media/saa7115.h>
 #include <media/tvp5150.h>
 #include <media/tveeprom.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
 
 #include "em28xx.h"
 
@@ -52,6 +52,15 @@ struct em28xx_hash_table {
 };
 
 struct em28xx_board em28xx_boards[] = {
+        [EM2750_BOARD_UNKNOWN] = {
+                .name          = "Unknown EM2750/EM2751 webcam grabber",
+                .vchannels     = 1,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 0,
+                } },
+        },
         [EM2800_BOARD_UNKNOWN] = {
                 .name         = "Unknown EM2800 video grabber",
                 .is_em2800    = 1,
@@ -73,6 +82,39 @@ struct em28xx_board em28xx_boards[] = {
                 .is_em2800    = 0,
                 .tuner_type   = TUNER_ABSENT,
         },
+        [EM2750_BOARD_DLCW_130] = {
+                /* Beijing Huaqi Information Digital Technology Co., Ltd */
+                .name          = "Huaqi DLCW-130",
+                .valid         = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 1,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 0,
+                } },
+        },
+        [EM2800_BOARD_KWORLD_USB2800] = {
+                .name         = "Kworld USB2800",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .is_em2800    = 1,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_PHILIPS_FCV1236D,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
         [EM2820_BOARD_KWORLD_PVRTV2800RF] = {
                 .name         = "Kworld PVR TV 2800 RF",
                 .is_em2800    = 0,
@@ -151,6 +193,376 @@ struct em28xx_board em28xx_boards[] = {
                                         MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
                 } },
         },
+        [EM2820_BOARD_DLINK_USB_TV] = {
+                .name         = "D-Link DUB-T210 TV Tuner",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .is_em2800    = 0,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_HERCULES_SMART_TV_USB2] = {
+                .name         = "Hercules Smart TV USB 2.0",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input        = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_PINNACLE_USB_2_FM1216ME] = {
+                .name         = "Pinnacle PCTV USB 2 (Philips FM1216ME)",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .is_em2800    = 0,
+                .tuner_type   = TUNER_PHILIPS_FM1216ME_MK3,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_GADMEI_UTV310] = {
+                .name         = "Gadmei UTV310",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_TNF_5335MF,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE] = {
+                .name         = "Leadtek Winfast USB II Deluxe",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_PHILIPS_FM1216ME_MK3,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7114,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_PINNACLE_DVC_100] = {
+                .name         = "Pinnacle Dazzle DVC 100",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = {
+                .name          = "Videology 20K14XUSB USB2.0",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 1,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 0,
+                } },
+        },
+        [EM2821_BOARD_PROLINK_PLAYTV_USB2] = {
+                .name         = "SIIG AVTuner-PVR/Prolink PlayTV USB 2.0",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .is_em2800    = 0,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,  /* unknown? */
+                .tda9887_conf = TDA9887_PRESENT,        /* unknown? */
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2821_BOARD_SUPERCOMP_USB_2] = {
+                .name         = "Supercomp USB 2.0 TV",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .is_em2800    = 0,
+                .tuner_type   = TUNER_PHILIPS_FM1236_MK3,
+                .tda9887_conf = TDA9887_PRESENT |
+                                TDA9887_PORT1_ACTIVE |
+                                TDA9887_PORT2_ACTIVE,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2821_BOARD_USBGEAR_VD204] = {
+                .name          = "Usbgear VD204v9",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 2,
+                .decoder       = EM28XX_SAA7113,
+                .input          = { {
+                        .type  = EM28XX_VMUX_COMPOSITE1,
+                        .vmux  = SAA7115_COMPOSITE0,
+                        .amux  = 1,
+                }, {
+                        .type  = EM28XX_VMUX_SVIDEO,
+                        .vmux  = SAA7115_SVIDEO3,
+                        .amux  = 1,
+                } },
+        },
+        [EM2860_BOARD_NETGMBH_CAM] = {
+                /* Beijing Huaqi Information Digital Technology Co., Ltd */
+                .name          = "NetGMBH Cam",
+                .valid       = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 1,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 0,
+                } },
+        },
+        [EM2860_BOARD_TYPHOON_DVD_MAKER] = {
+                .name          = "Typhoon DVD Maker",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 2,
+                .decoder       = EM28XX_SAA7113,
+                .input          = { {
+                        .type  = EM28XX_VMUX_COMPOSITE1,
+                        .vmux  = SAA7115_COMPOSITE0,
+                        .amux  = 1,
+                }, {
+                        .type  = EM28XX_VMUX_SVIDEO,
+                        .vmux  = SAA7115_SVIDEO3,
+                        .amux  = 1,
+                } },
+        },
+        [EM2860_BOARD_GADMEI_UTV330] = {
+                .name         = "Gadmei UTV330",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_TNF_5335MF,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = SAA7115_COMPOSITE2,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
+        [EM2860_BOARD_TERRATEC_HYBRID_XS] = {
+                .name         = "Terratec Cinergy A Hybrid XS",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2861_BOARD_KWORLD_PVRTV_300U] = {
+                .name         = "KWorld PVRTV 300U",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = {
+                .name          = "Yakumo MovieMixer",
+                .valid       = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels     = 1,
+                .decoder       = EM28XX_TVP5150,
+                .input         = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2861_BOARD_PLEXTOR_PX_TV100U] = {
+                .name         = "Plextor ConvertX PX-TV100U",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_TNF_5335MF,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2870_BOARD_TERRATEC_XS] = {
+                .name         = "Terratec Cinergy T XS",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type   = TUNER_XC2028,
+        },
+        [EM2870_BOARD_TERRATEC_XS_MT2060] = {
+                .name         = "Terratec Cinergy T XS (MT2060)",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type   = TUNER_ABSENT, /* MT2060 */
+        },
+        [EM2870_BOARD_KWORLD_350U] = {
+                .name         = "Kworld 350 U DVB-T",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type   = TUNER_XC2028,
+        },
+        [EM2870_BOARD_KWORLD_355U] = {
+                .name         = "Kworld 355 U DVB-T",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+        },
+        [EM2870_BOARD_PINNACLE_PCTV_DVB] = {
+                .name         = "Pinnacle PCTV DVB-T",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type   = TUNER_ABSENT, /* MT2060 */
+        },
+        [EM2870_BOARD_COMPRO_VIDEOMATE] = {
+                .name         = "Compro, VideoMate U3",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type   = TUNER_ABSENT, /* MT2060 */
+        },
+        [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = {
+                .name         = "Terratec Hybrid XS Secam",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .has_msp34xx  = 1,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
         [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
                 .name         = "Hauppauge WinTV HVR 900",
                 .vchannels    = 3,
@@ -194,7 +606,7 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = 1,
                 } },
         },
-        [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950] = {
+        [EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950] = {
                 .name           = "Hauppauge WinTV HVR 950",
                 .vchannels      = 3,
                 .tda9887_conf   = TDA9887_PRESENT,
@@ -240,12 +652,36 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = 1,
                 } },
         },
+        [EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600] = {
+                .name           = "AMD ATI TV Wonder HD 600",
+                .vchannels      = 3,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .tuner_type     = TUNER_XC2028,
+                .mts_firmware   = 1,
+                .has_12mhz_i2s  = 1,
+                .has_dvb        = 1,
+                .decoder        = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
         [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
                 .name         = "Terratec Hybrid XS",
                 .vchannels    = 3,
                 .tda9887_conf = TDA9887_PRESENT,
                 .tuner_type   = TUNER_XC2028,
                 .decoder      = EM28XX_TVP5150,
+                .has_dvb        = 1,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -328,6 +764,21 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = 1,
                 } },
         },
+        [EM2800_BOARD_GRABBEEX_USB2800] = {
+                .name         = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder",
+                .is_em2800    = 1,
+                .vchannels    = 2,
+                .decoder      = EM28XX_SAA7113,
+                .input          = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = 1,
+                } },
+        },
         [EM2800_BOARD_LEADTEK_WINFAST_USBII] = {
                 .name         = "Leadtek Winfast USB II",
                 .is_em2800    = 1,
@@ -439,13 +890,232 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = 0,
                 } },
         },
+        [EM2880_BOARD_MSI_DIGIVOX_AD] = {
+                .name         = "MSI DigiVox A/D",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2880_BOARD_MSI_DIGIVOX_AD_II] = {
+                .name         = "MSI DigiVox A/D II",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2880_BOARD_KWORLD_DVB_305U] = {
+                .name         = "KWorld DVB-T 305U",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2880_BOARD_KWORLD_DVB_310U] = {
+                .name         = "KWorld DVB-T 310U",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2881_BOARD_DNT_DA2_HYBRID] = {
+                .name         = "DNT DA2 Hybrid",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2881_BOARD_PINNACLE_HYBRID_PRO] = {
+                .name         = "Pinnacle Hybrid Pro",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2882_BOARD_PINNACLE_HYBRID_PRO] = {
+                .name         = "Pinnacle Hybrid Pro (2)",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2882_BOARD_KWORLD_VS_DVBT] = {
+                .name         = "Kworld VS-DVB-T 323UR",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2882_BOARD_TERRATEC_HYBRID_XS] = {
+                .name         = "Terratec Hybrid XS (em2882)",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2883_BOARD_KWORLD_HYBRID_A316] = {
+                .name         = "Kworld PlusTV HD Hybrid 330",
+                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+                .vchannels    = 3,
+                .is_em2800    = 0,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                } },
+        },
+        [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
+                .name         = "Compro VideoMate ForYou/Stereo",
+                .vchannels    = 2,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .decoder      = EM28XX_TVP5150,
+                .input          = { {
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                } },
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
 /* table of devices that work with this driver */
 struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0xeb1a, 0x2750),
-                        .driver_info = EM2820_BOARD_UNKNOWN },
+                        .driver_info = EM2750_BOARD_UNKNOWN },
+        { USB_DEVICE(0xeb1a, 0x2751),
+                        .driver_info = EM2750_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2800),
                         .driver_info = EM2800_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2820),
@@ -462,36 +1132,78 @@ struct usb_device_id em28xx_id_table [] = {
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2883),
                         .driver_info = EM2820_BOARD_UNKNOWN },
+        { USB_DEVICE(0xeb1a, 0xe300),
+                        .driver_info = EM2861_BOARD_KWORLD_PVRTV_300U },
+        { USB_DEVICE(0xeb1a, 0xe305),
+                        .driver_info = EM2880_BOARD_KWORLD_DVB_305U },
+        { USB_DEVICE(0xeb1a, 0xe310),
+                        .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD },
+        { USB_DEVICE(0xeb1a, 0xa316),
+                        .driver_info = EM2883_BOARD_KWORLD_HYBRID_A316 },
+        { USB_DEVICE(0xeb1a, 0xe320),
+                        .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD_II },
+        { USB_DEVICE(0xeb1a, 0xe323),
+                        .driver_info = EM2882_BOARD_KWORLD_VS_DVBT },
+        { USB_DEVICE(0xeb1a, 0xe350),
+                        .driver_info = EM2870_BOARD_KWORLD_350U },
+        { USB_DEVICE(0xeb1a, 0xe355),
+                        .driver_info = EM2870_BOARD_KWORLD_355U },
+        { USB_DEVICE(0xeb1a, 0x2801),
+                        .driver_info = EM2800_BOARD_GRABBEEX_USB2800 },
+        { USB_DEVICE(0xeb1a, 0xe357),
+                        .driver_info = EM2870_BOARD_KWORLD_355U },
         { USB_DEVICE(0x0ccd, 0x0036),
                         .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
-        { USB_DEVICE(0x2304, 0x0208),
-                        .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
+        { USB_DEVICE(0x0ccd, 0x004c),
+                        .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS_FR },
+        { USB_DEVICE(0x0ccd, 0x004f),
+                        .driver_info = EM2860_BOARD_TERRATEC_HYBRID_XS },
+        { USB_DEVICE(0x0ccd, 0x005e),
+                        .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
+        { USB_DEVICE(0x0ccd, 0x0042),
+                        .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
+        { USB_DEVICE(0x0ccd, 0x0043),
+                        .driver_info = EM2870_BOARD_TERRATEC_XS },
+        { USB_DEVICE(0x0ccd, 0x0047),
+                        .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
+        { USB_DEVICE(0x185b, 0x2870),
+                        .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
+        { USB_DEVICE(0x185b, 0x2041),
+                        .driver_info = EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU },
         { USB_DEVICE(0x2040, 0x4200),
                         .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
         { USB_DEVICE(0x2040, 0x4201),
                         .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
-        { USB_DEVICE(0x2304, 0x0207),
-                        .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
-        { USB_DEVICE(0x2304, 0x021a),
-                        .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
-        { USB_DEVICE(0x2304, 0x0227),
-                        .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
         { USB_DEVICE(0x2040, 0x6500),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
         { USB_DEVICE(0x2040, 0x6502),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 },
         { USB_DEVICE(0x2040, 0x6513), /* HCW HVR-980 */
-                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+                        .driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x2040, 0x6517), /* HP  HVR-950 */
-                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+                        .driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x2040, 0x651b), /* RP  HVR-950 */
-                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+                        .driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x2040, 0x651f), /* HCW HVR-850 */
-                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
-        { USB_DEVICE(0x0ccd, 0x0042),
-                        .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
-        { USB_DEVICE(0x0ccd, 0x0047),
-                        .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
+                        .driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x0438, 0xb002),
+                        .driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },
+        { USB_DEVICE(0x2001, 0xf112),
+                        .driver_info = EM2820_BOARD_DLINK_USB_TV },
+        { USB_DEVICE(0x2304, 0x0207),
+                        .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
+        { USB_DEVICE(0x2304, 0x0208),
+                        .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
+        { USB_DEVICE(0x2304, 0x021a),
+                        .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
+        { USB_DEVICE(0x2304, 0x0226),
+                        .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },
+        { USB_DEVICE(0x2304, 0x0227),
+                        .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
+        { USB_DEVICE(0x0413, 0x6023),
+                        .driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII },
+        { USB_DEVICE(0x093b, 0xa005),
+                        .driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U },
         { },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -500,6 +1212,18 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table);
  *  Reset sequences for analog/digital modes
  */
 
+/* Reset for the most [analog] boards */
+static struct em28xx_reg_seq default_analog[] = {
+        {EM28XX_R08_GPIO,       0x6d,   ~EM_GPIO_4,     10},
+        {       -1,             -1,     -1,             -1},
+};
+
+/* Reset for the most [digital] boards */
+static struct em28xx_reg_seq default_digital[] = {
+        {EM28XX_R08_GPIO,       0x6e,   ~EM_GPIO_4,     10},
+        {       -1,             -1,     -1,             -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
         {EM28XX_R08_GPIO,       0x2d,   ~EM_GPIO_4,     10},
@@ -515,14 +1239,42 @@ static struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
         { -1,                   -1,     -1,             -1},
 };
 
-/* Board Hauppauge WinTV HVR 900 tuner_callback */
-static struct em28xx_reg_seq hauppauge_wintv_hvr_900_tuner_callback[] = {
+/* Boards - EM2880 MSI DIGIVOX AD and EM2880_BOARD_MSI_DIGIVOX_AD_II */
+static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = {
+        {EM28XX_R08_GPIO,       0x69,   ~EM_GPIO_4,      10},
+        {       -1,             -1,     -1,              -1},
+};
+
+/* Boards - EM2880 MSI DIGIVOX AD and EM2880_BOARD_MSI_DIGIVOX_AD_II */
+static struct em28xx_reg_seq em2880_msi_digivox_ad_digital[] = {
+        {EM28XX_R08_GPIO,       0x6a,   ~EM_GPIO_4,     10},
+        {       -1,             -1,     -1,             -1},
+};
+
+/* Board  - EM2870 Kworld 355u
+   Analog - No input analog */
+static struct em28xx_reg_seq em2870_kworld_355u_digital[] = {
+        {EM2880_R04_GPO,        0x01,   0xff,           10},
+        {  -1,                  -1,     -1,             -1},
+};
+
+/* Callback for the most boards */
+static struct em28xx_reg_seq default_callback[] = {
         {EM28XX_R08_GPIO,       EM_GPIO_4,      EM_GPIO_4,      10},
         {EM28XX_R08_GPIO,       0,              EM_GPIO_4,      10},
         {EM28XX_R08_GPIO,       EM_GPIO_4,      EM_GPIO_4,      10},
         {  -1,                  -1,             -1,             -1},
 };
 
+/* Callback for EM2882 TERRATEC HYBRID XS */
+static struct em28xx_reg_seq em2882_terratec_hybrid_xs_digital[] = {
+        {EM28XX_R08_GPIO,       0x2e,   0xff,              6},
+        {EM28XX_R08_GPIO,       0x3e,   ~EM_GPIO_4,        6},
+        {EM2880_R04_GPO,        0x04,   0xff,             10},
+        {EM2880_R04_GPO,        0x0c,   0xff,             10},
+        {  -1,                  -1,     -1,               -1},
+};
+
 /*
  * EEPROM hash table for devices with generic USB IDs
  */
@@ -569,6 +1321,7 @@ static void em28xx_set_model(struct em28xx *dev)
         dev->max_range_640_480 = em28xx_boards[dev->model].max_range_640_480;
         dev->has_dvb = em28xx_boards[dev->model].has_dvb;
         dev->has_snapshot_button = em28xx_boards[dev->model].has_snapshot_button;
+        dev->valid = em28xx_boards[dev->model].valid;
 }
 
 /* Since em28xx_pre_card_setup() requires a proper dev->model,
@@ -604,19 +1357,171 @@ void em28xx_pre_card_setup(struct em28xx *dev)
         case EM2880_BOARD_TERRATEC_PRODIGY_XS:
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
-        case EM2880_BOARD_TERRATEC_HYBRID_XS:
-        case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:
+        case EM2860_BOARD_TERRATEC_HYBRID_XS:
+        case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
+        case EM2882_BOARD_PINNACLE_HYBRID_PRO:
+        case EM2883_BOARD_KWORLD_HYBRID_A316:
+        case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                msleep(50);
+
+                /* Sets GPO/GPIO sequences for this device */
+                dev->analog_gpio      = hauppauge_wintv_hvr_900_analog;
+                dev->digital_gpio     = hauppauge_wintv_hvr_900_digital;
+                dev->tun_analog_gpio  = default_callback;
+                dev->tun_digital_gpio = default_callback;
+                break;
+
+        case EM2882_BOARD_TERRATEC_HYBRID_XS:
                 em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
                 em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
                 msleep(50);
 
+                /* should be added ir_codes here */
+
                 /* Sets GPO/GPIO sequences for this device */
                 dev->analog_gpio      = hauppauge_wintv_hvr_900_analog;
                 dev->digital_gpio     = hauppauge_wintv_hvr_900_digital;
-                dev->tun_analog_gpio  = hauppauge_wintv_hvr_900_tuner_callback;
-                dev->tun_digital_gpio = hauppauge_wintv_hvr_900_tuner_callback;
+                dev->tun_analog_gpio  = default_callback;
+                dev->tun_digital_gpio = em2882_terratec_hybrid_xs_digital;
+                break;
+
+        case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+        case EM2870_BOARD_TERRATEC_XS:
+        case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+        case EM2880_BOARD_KWORLD_DVB_310U:
+        case EM2870_BOARD_KWORLD_350U:
+        case EM2881_BOARD_DNT_DA2_HYBRID:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                msleep(50);
+
+                /* NOTE: EM2881_DNT_DA2_HYBRID spend 140 msleep for digital
+                         and analog commands. If this commands doesn't work,
+                         add this timer. */
 
+                /* Sets GPO/GPIO sequences for this device */
+                dev->analog_gpio      = default_analog;
+                dev->digital_gpio     = default_digital;
+                dev->tun_analog_gpio  = default_callback;
+                dev->tun_digital_gpio = default_callback;
+                break;
+
+        case EM2880_BOARD_MSI_DIGIVOX_AD:
+        case EM2880_BOARD_MSI_DIGIVOX_AD_II:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                msleep(50);
+
+                /* Sets GPO/GPIO sequences for this device */
+                dev->analog_gpio      = em2880_msi_digivox_ad_analog;
+                dev->digital_gpio     = em2880_msi_digivox_ad_digital;
+                dev->tun_analog_gpio  = default_callback;
+                dev->tun_digital_gpio = default_callback;
+                break;
+
+        case EM2750_BOARD_UNKNOWN:
+        case EM2750_BOARD_DLCW_130:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x0a", 1);
+                break;
+
+        case EM2861_BOARD_PLEXTOR_PX_TV100U:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* FIXME guess */
+                /* Turn on analog audio output */
+                em28xx_write_regs_req(dev, 0x00, 0x08, "\xfd", 1);
+                break;
+
+        case EM2861_BOARD_KWORLD_PVRTV_300U:
+        case EM2880_BOARD_KWORLD_DVB_305U:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x4c", 1);
+                msleep(10);
+                em28xx_write_regs(dev, 0x08, "\x6d", 1);
+                msleep(10);
+                em28xx_write_regs(dev, 0x08, "\x7d", 1);
+                msleep(10);
+                break;
+
+        case EM2870_BOARD_KWORLD_355U:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                msleep(50);
+
+                /* Sets GPO/GPIO sequences for this device */
+                dev->digital_gpio     = em2870_kworld_355u_digital;
+                break;
+
+        case EM2870_BOARD_COMPRO_VIDEOMATE:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* TODO: someone can do some cleanup here...
+                         not everything's needed */
+                em28xx_write_regs(dev, 0x04, "\x00", 1);
+                msleep(10);
+                em28xx_write_regs(dev, 0x04, "\x01", 1);
+                msleep(10);
+                em28xx_write_regs(dev, 0x08, "\xfd", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xfc", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xdc", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xfc", 1);
+                mdelay(70);
+                break;
+
+        case EM2870_BOARD_TERRATEC_XS_MT2060:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* this device needs some gpio writes to get the DVB-T
+                   demod work */
+                em28xx_write_regs(dev, 0x08, "\xfe", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xde", 1);
+                mdelay(70);
+                dev->em28xx_write_regs(dev, 0x08, "\xfe", 1);
+                mdelay(70);
+                break;
+
+        case EM2870_BOARD_PINNACLE_PCTV_DVB:
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* this device needs some gpio writes to get the
+                   DVB-T demod work */
+                em28xx_write_regs(dev, 0x08, "\xfe", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xde", 1);
+                mdelay(70);
+                em28xx_write_regs(dev, 0x08, "\xfe", 1);
+                mdelay(70);
+                /* switch em2880 rc protocol */
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x22", 1);
+                /* should be added ir_codes here */
+                break;
+
+        case EM2820_BOARD_GADMEI_UTV310:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* Turn on analog audio output */
+                em28xx_write_regs_req(dev, 0x00, 0x08, "\xfd", 1);
+                break;
+
+        case EM2860_BOARD_GADMEI_UTV330:
+                /* Turn on IR */
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x07", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* should be added ir_codes here */
+                break;
+
+        case EM2820_BOARD_MSI_VOX_USB_2:
+                em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+                em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
+                /* enables audio for that device */
+                em28xx_write_regs_req(dev, 0x00, 0x08, "\xfd", 1);
                 break;
         }
 
@@ -639,12 +1544,16 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
                 ctl->demod = XC3028_FE_ZARLINK456;
                 break;
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+                ctl->demod = XC3028_FE_ZARLINK456;
+                break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
                 /* djh - Not sure which demod we need here */
                 ctl->demod = XC3028_FE_DEFAULT;
                 break;
-        case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:
+        case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
+        case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
                 /* FIXME: Better to specify the needed IF */
                 ctl->demod = XC3028_FE_DEFAULT;
                 break;
@@ -809,6 +1718,8 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
                 break;
         case (EM2800_BOARD_KWORLD_USB2800):
                 break;
+        case (EM2800_BOARD_GRABBEEX_USB2800):
+                break;
         }
 }
 
@@ -823,7 +1734,7 @@ void em28xx_card_setup(struct em28xx *dev)
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
-        case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:
+        case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         {
                 struct tveeprom tv;
 #ifdef CONFIG_MODULES
@@ -836,7 +1747,7 @@ void em28xx_card_setup(struct em28xx *dev)
 
                 dev->tuner_type = tv.tuner_type;
 
-                if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
+                if (tv.audio_processor == V4L2_IDENT_MSPX4XX) {
                         dev->i2s_speed = 2048000;
                         dev->has_msp34xx = 1;
                 }
@@ -854,11 +1765,21 @@ void em28xx_card_setup(struct em28xx *dev)
         case EM2800_BOARD_UNKNOWN:
                 if (!em28xx_hint_board(dev))
                         em28xx_set_model(dev);
+                break;
         }
 
         if (dev->has_snapshot_button)
                 em28xx_register_snapshot_button(dev);
 
+        if (dev->valid == EM28XX_BOARD_NOT_VALIDATED) {
+                em28xx_errdev("\n\n");
+                em28xx_errdev("The support for this board weren't "
+                              "valid yet.\n");
+                em28xx_errdev("Please send a report of having this working\n");
+                em28xx_errdev("not to V4L mailing list (and/or to other "
+                                "addresses)\n\n");
+        }
+
         /* Allow override tuner type by a module parameter */
         if (tuner >= 0)
                 dev->tuner_type = tuner;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index cc61cfb23a4a..4b992bc0083c 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -6,6 +6,7 @@
  (c) 2008 Devin Heitmueller <devin.heitmueller@gmail.com>
         - Fixes for the driver to properly work with HVR-950
         - Fixes for the driver to properly work with Pinnacle PCTV HD Pro Stick
+        - Fixes for the driver to properly work with AMD ATI TV Wonder HD 600
 
  (c) 2008 Aidan Thornton <makosoft@googlemail.com>
 
@@ -409,8 +410,9 @@ static int dvb_init(struct em28xx *dev)
         em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
         /* init frontend */
         switch (dev->model) {
-        case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:
+        case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
+        case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
                 dvb->frontend = dvb_attach(lgdt330x_attach,
                                            &em2880_lgdt3303_dev,
                                            &dev->i2c_adap);
@@ -441,6 +443,15 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
 #endif
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+                dvb->frontend = dvb_attach(zl10353_attach,
+                                                &em28xx_zl10353_with_xc3028,
+                                                &dev->i2c_adap);
+                if (attach_xc3028(0x61, dev) < 0) {
+                         result = -EINVAL;
+                        goto out_free;
+                }
+                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n",
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 2d9f14d2a00b..49ab0629702e 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -38,6 +38,7 @@
 
 #include "em28xx.h"
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/msp3400.h>
 #include <media/tuner.h>
 
@@ -1763,20 +1764,7 @@ static const struct file_operations em28xx_v4l_fops = {
         .compat_ioctl  = v4l_compat_ioctl32,
 };
 
-static const struct file_operations radio_fops = {
-        .owner         = THIS_MODULE,
-        .open          = em28xx_v4l2_open,
-        .release       = em28xx_v4l2_close,
-        .ioctl         = video_ioctl2,
-        .compat_ioctl  = v4l_compat_ioctl32,
-        .llseek        = no_llseek,
-};
-
-static const struct video_device em28xx_video_template = {
-        .fops                       = &em28xx_v4l_fops,
-        .release                    = video_device_release,
-
-        .minor                      = -1,
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querycap            = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap    = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap       = vidioc_g_fmt_vid_cap,
@@ -1814,16 +1802,29 @@ static const struct video_device em28xx_video_template = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         .vidiocgmbuf                = vidiocgmbuf,
 #endif
+};
+
+static const struct video_device em28xx_video_template = {
+        .fops                       = &em28xx_v4l_fops,
+        .release                    = video_device_release,
+        .ioctl_ops                  = &video_ioctl_ops,
+
+        .minor                      = -1,
 
         .tvnorms                    = V4L2_STD_ALL,
         .current_norm               = V4L2_STD_PAL,
 };
 
-static struct video_device em28xx_radio_template = {
-        .name                 = "em28xx-radio",
-        .type                 = VID_TYPE_TUNER,
-        .fops                 = &radio_fops,
-        .minor                = -1,
+static const struct file_operations radio_fops = {
+        .owner         = THIS_MODULE,
+        .open          = em28xx_v4l2_open,
+        .release       = em28xx_v4l2_close,
+        .ioctl         = video_ioctl2,
+        .compat_ioctl  = v4l_compat_ioctl32,
+        .llseek        = no_llseek,
+};
+
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_querycap      = radio_querycap,
         .vidioc_g_tuner       = radio_g_tuner,
         .vidioc_enum_input    = radio_enum_input,
@@ -1842,6 +1843,13 @@ static struct video_device em28xx_radio_template = {
 #endif
 };
 
+static struct video_device em28xx_radio_template = {
+        .name                 = "em28xx-radio",
+        .fops                 = &radio_fops,
+        .ioctl_ops            = &radio_ioctl_ops,
+        .minor                = -1,
+};
+
 /******************************** usb interface ******************************/
 
 
@@ -1882,7 +1890,6 @@ EXPORT_SYMBOL(em28xx_unregister_extension);
 
 static struct video_device *em28xx_vdev_init(struct em28xx *dev,
                                              const struct video_device *template,
-                                             const int type,
                                              const char *type_name)
 {
         struct video_device *vfd;
@@ -1892,9 +1899,8 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev = &dev->udev->dev;
+        vfd->parent = &dev->udev->dev;
         vfd->release = video_device_release;
-        vfd->type = type;
         vfd->debug = video_debug;
 
         snprintf(vfd->name, sizeof(vfd->name), "%s %s",
@@ -1972,14 +1978,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         list_add_tail(&dev->devlist, &em28xx_devlist);
 
         /* allocate and fill video video_device struct */
-        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template,
-                                          VID_TYPE_CAPTURE, "video");
+        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
         if (NULL == dev->vdev) {
                 em28xx_errdev("cannot allocate video_device.\n");
                 goto fail_unreg;
         }
-        if (dev->tuner_type != TUNER_ABSENT)
-                dev->vdev->type |= VID_TYPE_TUNER;
 
         /* register v4l2 video video_device */
         retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
@@ -1991,8 +1994,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         }
 
         /* Allocate and fill vbi video_device struct */
-        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
-                                          VFL_TYPE_VBI, "vbi");
+        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
         /* register v4l2 vbi video_device */
         if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
                                         vbi_nr[dev->devno]) < 0) {
@@ -2002,8 +2004,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         }
 
         if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
-                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template,
-                                        VFL_TYPE_RADIO, "radio");
+                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
                 if (NULL == dev->radio_dev) {
                         em28xx_errdev("cannot allocate video_device.\n");
                         goto fail_unreg;
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 89842c5d64a1..9a3310748685 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -54,15 +54,58 @@
 #define EM2880_BOARD_TERRATEC_PRODIGY_XS        13
 #define EM2820_BOARD_PROLINK_PLAYTV_USB2        14
 #define EM2800_BOARD_VGEAR_POCKETTV             15
-#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950    16
+#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950    16
 #define EM2880_BOARD_PINNACLE_PCTV_HD_PRO       17
 #define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 18
 #define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19
+#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600   20
+#define EM2800_BOARD_GRABBEEX_USB2800           21
+#define EM2750_BOARD_UNKNOWN                      22
+#define EM2750_BOARD_DLCW_130                     23
+#define EM2820_BOARD_DLINK_USB_TV                 24
+#define EM2820_BOARD_GADMEI_UTV310                25
+#define EM2820_BOARD_HERCULES_SMART_TV_USB2       26
+#define EM2820_BOARD_PINNACLE_USB_2_FM1216ME      27
+#define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28
+#define EM2820_BOARD_PINNACLE_DVC_100             29
+#define EM2820_BOARD_VIDEOLOGY_20K14XUSB          30
+#define EM2821_BOARD_USBGEAR_VD204                31
+#define EM2821_BOARD_SUPERCOMP_USB_2              32
+#define EM2821_BOARD_PROLINK_PLAYTV_USB2          33
+#define EM2860_BOARD_TERRATEC_HYBRID_XS           34
+#define EM2860_BOARD_TYPHOON_DVD_MAKER            35
+#define EM2860_BOARD_NETGMBH_CAM                  36
+#define EM2860_BOARD_GADMEI_UTV330                37
+#define EM2861_BOARD_YAKUMO_MOVIE_MIXER           38
+#define EM2861_BOARD_KWORLD_PVRTV_300U            39
+#define EM2861_BOARD_PLEXTOR_PX_TV100U            40
+#define EM2870_BOARD_KWORLD_350U                  41
+#define EM2870_BOARD_KWORLD_355U                  42
+#define EM2870_BOARD_TERRATEC_XS                  43
+#define EM2870_BOARD_TERRATEC_XS_MT2060           44
+#define EM2870_BOARD_PINNACLE_PCTV_DVB            45
+#define EM2870_BOARD_COMPRO_VIDEOMATE             46
+#define EM2880_BOARD_KWORLD_DVB_305U              47
+#define EM2880_BOARD_KWORLD_DVB_310U              48
+#define EM2880_BOARD_MSI_DIGIVOX_AD               49
+#define EM2880_BOARD_MSI_DIGIVOX_AD_II            50
+#define EM2880_BOARD_TERRATEC_HYBRID_XS_FR        51
+#define EM2881_BOARD_DNT_DA2_HYBRID               52
+#define EM2881_BOARD_PINNACLE_HYBRID_PRO          53
+#define EM2882_BOARD_KWORLD_VS_DVBT               54
+#define EM2882_BOARD_TERRATEC_HYBRID_XS           55
+#define EM2882_BOARD_PINNACLE_HYBRID_PRO          56
+#define EM2883_BOARD_KWORLD_HYBRID_A316           57
+#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU      58
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
 #define EM28XX_DEF_BUF 8
 
+/* Params for validated field */
+#define EM28XX_BOARD_NOT_VALIDATED 1
+#define EM28XX_BOARD_VALIDATED     0
+
 /* maximum number of em28xx boards */
 #define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */
 
@@ -251,6 +294,7 @@ struct em28xx_board {
         unsigned int max_range_640_480:1;
         unsigned int has_dvb:1;
         unsigned int has_snapshot_button:1;
+        unsigned int valid:1;
 
         enum em28xx_decoder decoder;
 
@@ -331,6 +375,7 @@ struct em28xx {
         unsigned int max_range_640_480:1;
         unsigned int has_dvb:1;
         unsigned int has_snapshot_button:1;
+        unsigned int valid:1;           /* report for validated boards */
 
         /* Some older em28xx chips needs a waiting time after writing */
         unsigned int wait_after_write;
@@ -360,7 +405,7 @@ struct em28xx {
         v4l2_std_id norm;       /* selected tv norm */
         int ctl_freq;           /* selected frequency */
         unsigned int ctl_input; /* selected input */
-        unsigned int ctl_ainput;        /* slected audio input */
+        unsigned int ctl_ainput;/* selected audio input */
         int mute;
         int volume;
         /* frame properties */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 15d037ae25c5..2d170d101c21 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -34,6 +34,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
+#include <media/v4l2-ioctl.h>
 #include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
@@ -985,7 +986,7 @@ static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
 
 static int et61x251_create_sysfs(struct et61x251_device* cam)
 {
-        struct device *classdev = &(cam->v4ldev->class_dev);
+        struct device *classdev = &(cam->v4ldev->dev);
         int err = 0;
 
         if ((err = device_create_file(classdev, &dev_attr_reg)))
@@ -2584,8 +2585,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &et61x251_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 013d593b0c67..44b0bffeb20e 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -25,9 +25,6 @@
 #define CONEX_CAM 1             /* special JPEG header */
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA USB Conexant Camera Driver");
 MODULE_LICENSE("GPL");
@@ -818,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
@@ -1011,9 +1007,8 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x0572, 0x0041), DVNM("Creative Notebook cx11646")},
+        {USB_DEVICE(0x0572, 0x0041)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1038,7 +1033,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 8ab4ea7201a9..c8c2f02fcf00 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -22,9 +22,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("Etoms USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -602,26 +599,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-/*      switch (vendor) { */
-/*      case 0x102c:            * Etoms */
-                switch (product) {
-                case 0x6151:
-                        sd->sensor = SENSOR_PAS106;     /* Etoms61x151 */
-                        break;
-                case 0x6251:
-                        sd->sensor = SENSOR_TAS5130CXX; /* Etoms61x251 */
-                        break;
-/*              } */
-/*              break; */
-        }
+
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 1;
+        sd->sensor = id->driver_info;
         if (sd->sensor == SENSOR_PAS106) {
                 cam->cam_mode = sif_mode;
                 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
@@ -911,12 +892,11 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static __devinitdata struct usb_device_id device_table[] = {
 #ifndef CONFIG_USB_ET61X251
-        {USB_DEVICE(0x102c, 0x6151), DVNM("Qcam Sangha CIF")},
+        {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
 #endif
-        {USB_DEVICE(0x102c, 0x6251), DVNM("Qcam xxxxxx VGA")},
+        {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
         {}
 };
 
@@ -942,7 +922,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 16e367cec760..3a051c925ff6 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -32,6 +32,7 @@
 #include <asm/page.h>
 #include <linux/uaccess.h>
 #include <linux/jiffies.h>
+#include <media/v4l2-ioctl.h>
 
 #include "gspca.h"
 
@@ -42,8 +43,7 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 2, 0)
 
 static int video_nr = -1;
 
@@ -209,6 +209,8 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
                                    &frame->v4l2_buf.timestamp);
                 frame->v4l2_buf.sequence = ++gspca_dev->sequence;
         } else if (gspca_dev->last_packet_type == DISCARD_PACKET) {
+                if (packet_type == LAST_PACKET)
+                        gspca_dev->last_packet_type = packet_type;
                 return frame;
         }
 
@@ -399,7 +401,7 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
  * This routine may be called many times when the bandwidth is too small
  * (the bandwidth is checked on urb submit).
  */
-struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
+static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
 {
         struct usb_interface *intf;
         struct usb_host_endpoint *ep;
@@ -832,7 +834,16 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         memset(cap, 0, sizeof *cap);
         strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);
-        strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card);
+/*      strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */
+        if (gspca_dev->dev->product != NULL) {
+                strncpy(cap->card, gspca_dev->dev->product,
+                        sizeof cap->card);
+        } else {
+                snprintf(cap->card, sizeof cap->card,
+                        "USB Camera (%04x:%04x)",
+                        le16_to_cpu(gspca_dev->dev->descriptor.idVendor),
+                        le16_to_cpu(gspca_dev->dev->descriptor.idProduct));
+        }
         strncpy(cap->bus_info, gspca_dev->dev->bus->bus_name,
                 sizeof cap->bus_info);
         cap->version = DRIVER_VERSION_NUMBER;
@@ -1649,12 +1660,7 @@ static struct file_operations dev_fops = {
         .poll   = dev_poll,
 };
 
-static struct video_device gspca_template = {
-        .name = "gspca main driver",
-        .type = VID_TYPE_CAPTURE,
-        .fops = &dev_fops,
-        .release = dev_release,         /* mandatory */
-        .minor = -1,
+static const struct v4l2_ioctl_ops dev_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
         .vidioc_dqbuf           = vidioc_dqbuf,
         .vidioc_qbuf            = vidioc_qbuf,
@@ -1683,6 +1689,14 @@ static struct video_device gspca_template = {
 #endif
 };
 
+static struct video_device gspca_template = {
+        .name = "gspca main driver",
+        .fops = &dev_fops,
+        .ioctl_ops = &dev_ioctl_ops,
+        .release = dev_release,         /* mandatory */
+        .minor = -1,
+};
+
 /*
  * probe and create a new gspca device
  *
@@ -1740,10 +1754,11 @@ int gspca_dev_probe(struct usb_interface *intf,
 
         /* init video stuff */
         memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
-        gspca_dev->vdev.dev = &dev->dev;
+        gspca_dev->vdev.parent = &dev->dev;
         memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops);
         gspca_dev->vdev.fops = &gspca_dev->fops;
         gspca_dev->fops.owner = module;         /* module protection */
+        gspca_dev->present = 1;
         ret = video_register_device(&gspca_dev->vdev,
                                   VFL_TYPE_GRABBER,
                                   video_nr);
@@ -1752,7 +1767,6 @@ int gspca_dev_probe(struct usb_interface *intf,
                 goto out;
         }
 
-        gspca_dev->present = 1;
         usb_set_intfdata(intf, gspca_dev);
         PDEBUG(D_PROBE, "probe ok");
         return 0;
@@ -1885,7 +1899,10 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
 /* -- module insert / remove -- */
 static int __init gspca_init(void)
 {
-        info("main v%s registered", version);
+        info("main v%d.%d.%d registered",
+                (DRIVER_VERSION_NUMBER >> 16) & 0xff,
+                (DRIVER_VERSION_NUMBER >> 8) & 0xff,
+                DRIVER_VERSION_NUMBER & 0xff);
         return 0;
 }
 static void __exit gspca_exit(void)
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 88c2b02f380a..21c4ee56a10a 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -24,9 +24,6 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/Mars USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -140,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
@@ -424,9 +420,8 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x093a, 0x050f), DVNM("Mars-Semi Pc-Camera")},
+        {USB_DEVICE(0x093a, 0x050f)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -451,7 +446,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 08d99c3b78e2..83139efc4629 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("OV519 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -1375,7 +1372,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->cam_mode = sif_mode;
                 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
         }
-        cam->dev_name = (char *) id->driver_info;
         sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
         sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
         sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
@@ -2129,21 +2125,20 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x4052), DVNM("Creative Live! VISTA IM")},
-        {USB_DEVICE(0x041e, 0x405f), DVNM("Creative Live! VISTA VF0330")},
-        {USB_DEVICE(0x041e, 0x4060), DVNM("Creative Live! VISTA VF0350")},
-        {USB_DEVICE(0x041e, 0x4061), DVNM("Creative Live! VISTA VF0400")},
-        {USB_DEVICE(0x041e, 0x4064), DVNM("Creative Live! VISTA VF0420")},
-        {USB_DEVICE(0x041e, 0x4068), DVNM("Creative Live! VISTA VF0470")},
-        {USB_DEVICE(0x045e, 0x028c), DVNM("Microsoft xbox cam")},
-        {USB_DEVICE(0x054c, 0x0154), DVNM("Sonny toy4")},
-        {USB_DEVICE(0x054c, 0x0155), DVNM("Sonny toy5")},
-        {USB_DEVICE(0x05a9, 0x0519), DVNM("OmniVision")},
-        {USB_DEVICE(0x05a9, 0x0530), DVNM("OmniVision")},
-        {USB_DEVICE(0x05a9, 0x4519), DVNM("OmniVision")},
-        {USB_DEVICE(0x05a9, 0x8519), DVNM("OmniVision")},
+        {USB_DEVICE(0x041e, 0x4052)},
+        {USB_DEVICE(0x041e, 0x405f)},
+        {USB_DEVICE(0x041e, 0x4060)},
+        {USB_DEVICE(0x041e, 0x4061)},
+        {USB_DEVICE(0x041e, 0x4064)},
+        {USB_DEVICE(0x041e, 0x4068)},
+        {USB_DEVICE(0x045e, 0x028c)},
+        {USB_DEVICE(0x054c, 0x0154)},
+        {USB_DEVICE(0x054c, 0x0155)},
+        {USB_DEVICE(0x05a9, 0x0519)},
+        {USB_DEVICE(0x05a9, 0x0530)},
+        {USB_DEVICE(0x05a9, 0x4519)},
+        {USB_DEVICE(0x05a9, 0x8519)},
         {}
 };
 #undef DVNAME
@@ -2169,7 +2164,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index fa7abc411090..7ef18d578811 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -27,9 +27,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>");
 MODULE_DESCRIPTION("Pixart PAC207");
 MODULE_LICENSE("GPL");
@@ -208,7 +205,7 @@ static int pac207_write_regs(struct gspca_dev *gspca_dev, u16 index,
 }
 
 
-int pac207_write_reg(struct gspca_dev *gspca_dev, u16 index, u16 value)
+static int pac207_write_reg(struct gspca_dev *gspca_dev, u16 index, u16 value)
 {
         struct usb_device *udev = gspca_dev->dev;
         int err;
@@ -223,8 +220,7 @@ int pac207_write_reg(struct gspca_dev *gspca_dev, u16 index, u16 value)
         return err;
 }
 
-
-int pac207_read_reg(struct gspca_dev *gspca_dev, u16 index)
+static int pac207_read_reg(struct gspca_dev *gspca_dev, u16 index)
 {
         struct usb_device *udev = gspca_dev->dev;
         int res;
@@ -574,17 +570,16 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x4028), DVNM("Creative Webcam Vista Plus")},
-        {USB_DEVICE(0x093a, 0x2460), DVNM("Q-Tec Webcam 100")},
-        {USB_DEVICE(0x093a, 0x2463), DVNM("Philips spc200nc pac207")},
-        {USB_DEVICE(0x093a, 0x2464), DVNM("Labtec Webcam 1200")},
-        {USB_DEVICE(0x093a, 0x2468), DVNM("PAC207")},
-        {USB_DEVICE(0x093a, 0x2470), DVNM("Genius GF112")},
-        {USB_DEVICE(0x093a, 0x2471), DVNM("Genius VideoCam GE111")},
-        {USB_DEVICE(0x093a, 0x2472), DVNM("Genius VideoCam GE110")},
-        {USB_DEVICE(0x2001, 0xf115), DVNM("D-Link DSB-C120")},
+        {USB_DEVICE(0x041e, 0x4028)},
+        {USB_DEVICE(0x093a, 0x2460)},
+        {USB_DEVICE(0x093a, 0x2463)},
+        {USB_DEVICE(0x093a, 0x2464)},
+        {USB_DEVICE(0x093a, 0x2468)},
+        {USB_DEVICE(0x093a, 0x2470)},
+        {USB_DEVICE(0x093a, 0x2471)},
+        {USB_DEVICE(0x093a, 0x2472)},
+        {USB_DEVICE(0x2001, 0xf115)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -609,7 +604,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 5c052e31be4a..ea3d7021f401 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -23,9 +23,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Thomas Kaiser thomas@kaiser-linux.li");
 MODULE_DESCRIPTION("Pixart PAC7311");
 MODULE_LICENSE("GPL");
@@ -266,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         reg_w(gspca_dev, 0x3e, 0x20);
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x05;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
@@ -713,16 +709,14 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x093a, 0x2600), DVNM("Typhoon")},
-        {USB_DEVICE(0x093a, 0x2601), DVNM("Philips SPC610NC")},
-        {USB_DEVICE(0x093a, 0x2603), DVNM("PAC7312")},
-        {USB_DEVICE(0x093a, 0x2608), DVNM("Trust WB-3300p")},
-        {USB_DEVICE(0x093a, 0x260e), DVNM("Gigaware VGA PC Camera")},
-                        /* and also ', Trust WB-3350p, SIGMA cam 2350' */
-        {USB_DEVICE(0x093a, 0x260f), DVNM("SnakeCam")},
-        {USB_DEVICE(0x093a, 0x2621), DVNM("PAC731x")},
+        {USB_DEVICE(0x093a, 0x2600)},
+        {USB_DEVICE(0x093a, 0x2601)},
+        {USB_DEVICE(0x093a, 0x2603)},
+        {USB_DEVICE(0x093a, 0x2608)},
+        {USB_DEVICE(0x093a, 0x260e)},
+        {USB_DEVICE(0x093a, 0x260f)},
+        {USB_DEVICE(0x093a, 0x2621)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -747,7 +741,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index dbeebe8625c5..e18748c5a14d 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 8)
-static const char version[] = "2.1.8";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SN9C102 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -44,25 +41,29 @@ struct sd {
         unsigned char brightness;
         unsigned char autogain;
         unsigned char autogain_ignore_frames;
+        unsigned char frames_to_drop;
         unsigned char freq;             /* light freq filter setting */
-        unsigned char saturation;
-        unsigned char hue;
-        unsigned char contrast;
 
         unsigned char fr_h_sz;          /* size of frame header */
         char sensor;                    /* Type of image sensor chip */
 #define SENSOR_HV7131R 0
 #define SENSOR_OV6650 1
 #define SENSOR_OV7630 2
-#define SENSOR_OV7630_3 3
-#define SENSOR_PAS106 4
-#define SENSOR_PAS202 5
-#define SENSOR_TAS5110 6
-#define SENSOR_TAS5130CXX 7
+#define SENSOR_PAS106 3
+#define SENSOR_PAS202 4
+#define SENSOR_TAS5110 5
+#define SENSOR_TAS5130CXX 6
         char sensor_has_gain;
         __u8 sensor_addr;
+        __u8 reg11;
 };
 
+/* flags used in the device id table */
+#define F_GAIN 0x01             /* has gain */
+#define F_AUTO 0x02             /* has autogain */
+#define F_SIF  0x04             /* sif or vga */
+#define F_H18  0x08             /* long (18 b) or short (12 b) frame header */
+
 #define COMP2 0x8f
 #define COMP 0xc7               /* 0x87 //0x07 */
 #define COMP1 0xc9              /* 0x89 //0x09 */
@@ -92,12 +93,6 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
         {
@@ -174,48 +169,6 @@ static struct ctrl sd_ctrls[] = {
                 .set = sd_setfreq,
                 .get = sd_getfreq,
         },
-        {
-                {
-                        .id      = V4L2_CID_SATURATION,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Saturation",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-#define SATURATION_DEF 127
-                        .default_value = SATURATION_DEF,
-                },
-                .set = sd_setsaturation,
-                .get = sd_getsaturation,
-        },
-        {
-                {
-                        .id      = V4L2_CID_HUE,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Hue",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-#define HUE_DEF 127
-                        .default_value = HUE_DEF,
-                },
-                .set = sd_sethue,
-                .get = sd_gethue,
-        },
-        {
-                {
-                        .id      = V4L2_CID_CONTRAST,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Contrast",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-#define CONTRAST_DEF 127
-                        .default_value = CONTRAST_DEF,
-                },
-                .set = sd_setcontrast,
-                .get = sd_getcontrast,
-        },
 };
 
 static struct v4l2_pix_format vga_mode[] = {
@@ -248,8 +201,6 @@ static struct v4l2_pix_format sif_mode[] = {
                 .priv = 0},
 };
 
-static const __u8 probe_ov7630[] = {0x08, 0x44};
-
 static const __u8 initHv7131[] = {
         0x46, 0x77, 0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0x11, 0x00, 0x00, 0x00,
         0x00, 0x00,
@@ -321,7 +272,7 @@ static const __u8 initOv7630_3[] = {
         0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, /* r21 .. r28 */
         0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, 0xff  /* r29 .. r30 */
 };
-static const __u8 ov7630_sensor_init_com[][8] = {
+static const __u8 ov7630_sensor_init[][8] = {
         {0xa0, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10},
         {0xb0, 0x21, 0x01, 0x77, 0x3a, 0x00, 0x00, 0x10},
 /*      {0xd0, 0x21, 0x12, 0x7c, 0x01, 0x80, 0x34, 0x10},          jfm */
@@ -342,17 +293,6 @@ static const __u8 ov7630_sensor_init_com[][8] = {
         {0xa0, 0x21, 0x7d, 0xf7, 0x8e, 0x00, 0x30, 0x10},
         {0xd0, 0x21, 0x17, 0x1c, 0xbd, 0x06, 0xf6, 0x10},
 };
-static const __u8 ov7630_sensor_init[][8] = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 200ms */
-        {0xa0, 0x21, 0x11, 0x01, 0xbd, 0x06, 0xf6, 0x10},       /* jfm */
-        {0xa0, 0x21, 0x10, 0x57, 0xbd, 0x06, 0xf6, 0x16},
-        {0xa0, 0x21, 0x76, 0x02, 0xbd, 0x06, 0xf6, 0x16},
-        {0xa0, 0x21, 0x00, 0x10, 0xbd, 0x06, 0xf6, 0x15},       /* gain */
-};
-static const __u8 ov7630_sensor_init_3[][8] = {
-        {0xa0, 0x21, 0x2a, 0xa0, 0x00, 0x00, 0x00, 0x10},
-        {0xa0, 0x21, 0x2a, 0x80, 0x00, 0x00, 0x00, 0x10},
-};
 
 static const __u8 initPas106[] = {
         0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x40, 0x00, 0x00, 0x00,
@@ -542,7 +482,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case  SENSOR_OV6650:
-        case  SENSOR_OV7630_3:
         case  SENSOR_OV7630: {
                 __u8 i2cOV[] =
                         {0xa0, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x10};
@@ -635,7 +574,7 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
         case SENSOR_OV6650:
                 gain >>= 1;
                 /* fall thru */
-        case SENSOR_OV7630_3: {
+        case SENSOR_OV7630: {
                 __u8 i2c[] = {0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};
 
                 i2c[1] = sd->sensor_addr;
@@ -690,7 +629,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 break;
             }
         case SENSOR_OV6650:
-        case SENSOR_OV7630_3: {
+        case SENSOR_OV7630: {
                 /* The ov6650 / ov7630 have 2 registers which both influence
                    exposure, register 11, whose low nibble sets the nr off fps
                    according to: fps = 30 / (low_nibble + 1)
@@ -705,16 +644,20 @@ static void setexposure(struct gspca_dev *gspca_dev)
                    The code maps our 0 - 510 ms exposure ctrl to these 2
                    registers, trying to keep fps as high as possible.
                 */
-                __u8 i2c[] = {0xb0, 0x00, 0x10, 0x00, 0xc0, 0x00, 0x00, 0x10};
-                int reg10, reg11;
+                __u8 i2c[] = {0xb0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10};
+                int reg10, reg11, reg10_max;
+
                 /* ov6645 datasheet says reg10_max is 9a, but that uses
                    tline * 2 * reg10 as formula for calculating texpo, the
                    ov6650 probably uses the same formula as the 7730 which uses
                    tline * 4 * reg10, which explains why the reg10max we've
                    found experimentally for the ov6650 is exactly half that of
                    the ov6645. The ov7630 datasheet says the max is 0x41. */
-                const int reg10_max = (sd->sensor == SENSOR_OV6650)
-                                ? 0x4d : 0x41;
+                if (sd->sensor == SENSOR_OV6650) {
+                        reg10_max = 0x4d;
+                        i2c[4] = 0xc0; /* OV6650 needs non default vsync pol */
+                } else
+                        reg10_max = 0x41;
 
                 reg11 = (60 * sd->exposure + 999) / 1000;
                 if (reg11 < 1)
@@ -735,20 +678,23 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 else if (reg10 > reg10_max)
                         reg10 = reg10_max;
 
+                /* In 640x480, if the reg11 has less than 3, the image is
+                   unstable (not enough bandwidth). */
+                if (gspca_dev->width == 640 && reg11 < 3)
+                        reg11 = 3;
+
                 /* Write reg 10 and reg11 low nibble */
                 i2c[1] = sd->sensor_addr;
                 i2c[3] = reg10;
                 i2c[4] |= reg11 - 1;
-                if (sd->sensor == SENSOR_OV7630_3) {
-                        __u8 reg76 = reg10 & 0x03;
-                        __u8 i2c_reg76[] = {0xa0, 0x21, 0x76, 0x00,
-                                            0x00, 0x00, 0x00, 0x10};
-                        reg10 >>= 2;
-                        i2c_reg76[3] = reg76;
-                        if (i2c_w(gspca_dev, i2c_reg76) < 0)
-                                PDEBUG(D_ERR, "i2c error exposure");
-                }
-                if (i2c_w(gspca_dev, i2c) < 0)
+
+                /* If register 11 didn't change, don't change it */
+                if (sd->reg11 == reg11 )
+                        i2c[0] = 0xa0;
+
+                if (i2c_w(gspca_dev, i2c) == 0)
+                        sd->reg11 = reg11;
+                else
                         PDEBUG(D_ERR, "i2c error exposure");
                 break;
             }
@@ -761,11 +707,11 @@ static void setfreq(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case SENSOR_OV6650:
-        case SENSOR_OV7630_3: {
+        case SENSOR_OV7630: {
                 /* Framerate adjust register for artificial light 50 hz flicker
-                   compensation, identical to ov6630 0x2b register, see ov6630
-                   datasheet.
-                   0x4f -> (30 fps -> 25 fps), 0x00 -> no adjustment */
+                   compensation, for the ov6650 this is identical to ov6630
+                   0x2b register, see ov6630 datasheet.
+                   0x4f / 0x8a -> (30 fps -> 25 fps), 0x00 -> no adjustment */
                 __u8 i2c[] = {0xa0, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10};
                 switch (sd->freq) {
                 default:
@@ -786,69 +732,6 @@ static void setfreq(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setsaturation(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        switch (sd->sensor) {
-/*      case SENSOR_OV6650: */
-        case SENSOR_OV7630_3:
-        case SENSOR_OV7630: {
-                __u8 i2c[] = {0xa0, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10};
-                i2c[1] = sd->sensor_addr;
-                i2c[3] = sd->saturation & 0xf0;
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        PDEBUG(D_ERR, "i2c error setsaturation");
-                else
-                        PDEBUG(D_CONF, "saturation set to: %d",
-                                (int)sd->saturation);
-                break;
-            }
-        }
-}
-
-static void sethue(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        switch (sd->sensor) {
-/*      case SENSOR_OV6650: */
-        case SENSOR_OV7630_3:
-        case SENSOR_OV7630: {
-                __u8 i2c[] = {0xa0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x10};
-                i2c[1] = sd->sensor_addr;
-                i2c[3] = 0x20 | (sd->hue >> 3);
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        PDEBUG(D_ERR, "i2c error setsaturation");
-                else
-                        PDEBUG(D_CONF, "hue set to: %d", (int)sd->hue);
-                break;
-            }
-        }
-}
-
-static void setcontrast(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        switch (sd->sensor) {
-/*      case SENSOR_OV6650: */
-        case SENSOR_OV7630_3:
-        case SENSOR_OV7630: {
-                __u8 i2c[] = {0xa0, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10};
-                i2c[1] = sd->sensor_addr;
-                i2c[3] = 0x20 | (sd->contrast >> 3);
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        PDEBUG(D_ERR, "i2c error setcontrast");
-                else
-                        PDEBUG(D_CONF, "contrast set to: %d",
-                                (int)sd->contrast);
-                break;
-            }
-        }
-}
-
-
 static void do_autogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -874,88 +757,32 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 product;
         int sif = 0;
 
         /* nctrls depends upon the sensor, so we use a per cam copy */
         memcpy(&sd->sd_desc, gspca_dev->sd_desc, sizeof(struct sd_desc));
         gspca_dev->sd_desc = &sd->sd_desc;
 
-        sd->fr_h_sz = 12;               /* default size of the frame header */
-        sd->sd_desc.nctrls = 2;         /* default nb of ctrls */
-        sd->autogain = AUTOGAIN_DEF;    /* default is autogain active */
-
-        product = id->idProduct;
-/*      switch (id->idVendor) { */
-/*      case 0x0c45:                             * Sonix */
-                switch (product) {
-                case 0x6001:                    /* SN9C102 */
-                case 0x6005:                    /* SN9C101 */
-                case 0x6007:                    /* SN9C101 */
-                        sd->sensor = SENSOR_TAS5110;
-                        sd->sensor_has_gain = 1;
-                        sd->sd_desc.nctrls = 4;
-                        sd->sd_desc.dq_callback = do_autogain;
-                        sif = 1;
-                        break;
-                case 0x6009:                    /* SN9C101 */
-                case 0x600d:                    /* SN9C101 */
-                case 0x6029:                    /* SN9C101 */
-                        sd->sensor = SENSOR_PAS106;
-                        sif = 1;
-                        break;
-                case 0x6011:                    /* SN9C101 - SN9C101G */
-                        sd->sensor = SENSOR_OV6650;
-                        sd->sensor_has_gain = 1;
-                        sd->sensor_addr = 0x60;
-                        sd->sd_desc.nctrls = 5;
-                        sd->sd_desc.dq_callback = do_autogain;
-                        sif = 1;
-                        break;
-                case 0x6019:                    /* SN9C101 */
-                case 0x602c:                    /* SN9C102 */
-                case 0x602e:                    /* SN9C102 */
-                        sd->sensor = SENSOR_OV7630;
-                        sd->sensor_addr = 0x21;
-                        break;
-                case 0x60b0:                    /* SN9C103 */
-                        sd->sensor = SENSOR_OV7630_3;
-                        sd->sensor_addr = 0x21;
-                        sd->fr_h_sz = 18;       /* size of frame header */
-                        sd->sensor_has_gain = 1;
-                        sd->sd_desc.nctrls = 8;
-                        sd->sd_desc.dq_callback = do_autogain;
-                        sd->autogain = 0;
-                        break;
-                case 0x6024:                    /* SN9C102 */
-                case 0x6025:                    /* SN9C102 */
-                        sd->sensor = SENSOR_TAS5130CXX;
-                        break;
-                case 0x6028:                    /* SN9C102 */
-                        sd->sensor = SENSOR_PAS202;
-                        break;
-                case 0x602d:                    /* SN9C102 */
-                        sd->sensor = SENSOR_HV7131R;
-                        break;
-                case 0x60af:                    /* SN9C103 */
-                        sd->sensor = SENSOR_PAS202;
-                        sd->fr_h_sz = 18;       /* size of frame header (?) */
-                        break;
-                }
-/*              break; */
-/*      } */
+        /* copy the webcam info from the device id */
+        sd->sensor = (id->driver_info >> 24) & 0xff;
+        if (id->driver_info & (F_GAIN << 16))
+                sd->sensor_has_gain = 1;
+        if (id->driver_info & (F_AUTO << 16))
+                sd->sd_desc.dq_callback = do_autogain;
+        if (id->driver_info & (F_SIF << 16))
+                sif = 1;
+        if (id->driver_info & (F_H18 << 16))
+                sd->fr_h_sz = 18;               /* size of frame header */
+        else
+                sd->fr_h_sz = 12;
+        sd->sd_desc.nctrls = (id->driver_info >> 8) & 0xff;
+        sd->sensor_addr = id->driver_info & 0xff;
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         if (!sif) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
-                if (sd->sensor == SENSOR_OV7630_3) {
-                        /* We only have 320x240 & 640x480 */
-                        cam->cam_mode++;
-                        cam->nmodes--;
-                }
         } else {
                 cam->cam_mode = sif_mode;
                 cam->nmodes = ARRAY_SIZE(sif_mode);
@@ -963,12 +790,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->brightness = BRIGHTNESS_DEF;
         sd->gain = GAIN_DEF;
         sd->exposure = EXPOSURE_DEF;
+        sd->autogain = AUTOGAIN_DEF;
         sd->freq = FREQ_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->saturation = SATURATION_DEF;
-        sd->hue = HUE_DEF;
-        if (sd->sensor == SENSOR_OV7630_3)      /* jfm: from win trace */
-                reg_w(gspca_dev, 0x01, probe_ov7630, sizeof probe_ov7630);
+
         return 0;
 }
 
@@ -1002,9 +826,8 @@ static void pas106_i2cinit(struct gspca_dev *gspca_dev)
 static void sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int mode, l;
+        int mode, l = 0x1f;
         const __u8 *sn9c10x;
-        __u8 reg01, reg17;
         __u8 reg17_19[3];
 
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
@@ -1022,13 +845,11 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg17_19[2] = 0x20;
                 break;
         case SENSOR_OV7630:
-                sn9c10x = initOv7630;
-                reg17_19[0] = 0x68;
-                reg17_19[1] = (mode << 4) | COMP2;
-                reg17_19[2] = MCK_INIT1;
-                break;
-        case SENSOR_OV7630_3:
-                sn9c10x = initOv7630_3;
+                if (sd->fr_h_sz == 18) { /* SN9C103 */
+                        sn9c10x = initOv7630_3;
+                        l = sizeof initOv7630_3;
+                } else
+                        sn9c10x = initOv7630;
                 reg17_19[0] = 0x68;
                 reg17_19[1] = (mode << 4) | COMP2;
                 reg17_19[2] = MCK_INIT1;
@@ -1059,30 +880,11 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg17_19[2] = mode ? 0x23 : 0x43;
                 break;
         }
-        switch (sd->sensor) {
-        case SENSOR_OV7630:
-                reg01 = 0x06;
-                reg17 = 0x29;
-                l = sizeof initOv7630;
-                break;
-        case SENSOR_OV7630_3:
-                reg01 = 0x44;
-                reg17 = 0x68;
-                l = sizeof initOv7630_3;
-                break;
-        default:
-                reg01 = sn9c10x[0];
-                reg17 = sn9c10x[0x17 - 1];
-                l = 0x1f;
-                break;
-        }
 
         /* reg 0x01 bit 2 video transfert on */
-        reg_w(gspca_dev, 0x01, &reg01, 1);
+        reg_w(gspca_dev, 0x01, &sn9c10x[0x01 - 1], 1);
         /* reg 0x17 SensorClk enable inv Clk 0x60 */
-        reg_w(gspca_dev, 0x17, &reg17, 1);
-/*fixme: for ov7630 102
-        reg_w(gspca_dev, 0x01, {0x06, sn9c10x[1]}, 2); */
+        reg_w(gspca_dev, 0x17, &sn9c10x[0x17 - 1], 1);
         /* Set the registers from the template */
         reg_w_big(gspca_dev, 0x01, sn9c10x, l);
         switch (sd->sensor) {
@@ -1095,17 +897,13 @@ static void sd_start(struct gspca_dev *gspca_dev)
                                 sizeof ov6650_sensor_init);
                 break;
         case SENSOR_OV7630:
-                i2c_w_vector(gspca_dev, ov7630_sensor_init_com,
-                                sizeof ov7630_sensor_init_com);
-                msleep(200);
                 i2c_w_vector(gspca_dev, ov7630_sensor_init,
                                 sizeof ov7630_sensor_init);
-                break;
-        case SENSOR_OV7630_3:
-                i2c_w_vector(gspca_dev, ov7630_sensor_init_com,
-                                sizeof ov7630_sensor_init_com);
-                msleep(200);
-                i2c_w(gspca_dev, ov7630_sensor_init_3[mode]);
+                if (sd->fr_h_sz == 18) { /* SN9C103 */
+                        const __u8 i2c[] = { 0xa0, 0x21, 0x13, 0x80, 0x00,
+                                                0x00, 0x00, 0x10 };
+                        i2c_w(gspca_dev, i2c);
+                }
                 break;
         case SENSOR_PAS106:
                 pas106_i2cinit(gspca_dev);
@@ -1145,14 +943,14 @@ static void sd_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x18, &reg17_19[1], 2);
         msleep(20);
 
+        sd->reg11 = -1;
+
         setgain(gspca_dev);
         setbrightness(gspca_dev);
         setexposure(gspca_dev);
         setfreq(gspca_dev);
-        setsaturation(gspca_dev);
-        sethue(gspca_dev);
-        setcontrast(gspca_dev);
 
+        sd->frames_to_drop = 0;
         sd->autogain_ignore_frames = 0;
         atomic_set(&sd->avg_lum, -1);
 }
@@ -1198,21 +996,31 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                             && data[3 + i] == 0xc4
                             && data[4 + i] == 0xc4
                             && data[5 + i] == 0x96) {   /* start of frame */
-                                frame = gspca_frame_add(gspca_dev, LAST_PACKET,
-                                                        frame, data, 0);
+                                int lum = -1;
+                                int pkt_type = LAST_PACKET;
+
                                 if (len - i < sd->fr_h_sz) {
-                                        atomic_set(&sd->avg_lum, -1);
                                         PDEBUG(D_STREAM, "packet too short to"
                                                 " get avg brightness");
                                 } else if (sd->fr_h_sz == 12) {
-                                        atomic_set(&sd->avg_lum,
-                                                data[i + 8] +
-                                                        (data[i + 9] << 8));
+                                        lum = data[i + 8] + (data[i + 9] << 8);
                                 } else {
-                                        atomic_set(&sd->avg_lum,
-                                                data[i + 9] +
-                                                        (data[i + 10] << 8));
+                                        lum = data[i + 9] +
+                                                (data[i + 10] << 8);
+                                }
+                                if (lum == 0) {
+                                        lum = -1;
+                                        sd->frames_to_drop = 2;
+                                }
+                                atomic_set(&sd->avg_lum, lum);
+
+                                if (sd->frames_to_drop) {
+                                        sd->frames_to_drop--;
+                                        pkt_type = DISCARD_PACKET;
                                 }
+
+                                frame = gspca_frame_add(gspca_dev, pkt_type,
+                                                        frame, data, 0);
                                 data += i + sd->fr_h_sz;
                                 len -= i + sd->fr_h_sz;
                                 gspca_frame_add(gspca_dev, FIRST_PACKET,
@@ -1327,60 +1135,6 @@ static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->saturation = val;
-        if (gspca_dev->streaming)
-                setsaturation(gspca_dev);
-        return 0;
-}
-
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->saturation;
-        return 0;
-}
-
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hue = val;
-        if (gspca_dev->streaming)
-                sethue(gspca_dev);
-        return 0;
-}
-
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hue;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                         struct v4l2_querymenu *menu)
 {
@@ -1418,27 +1172,47 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
+#define SFCI(sensor, flags, nctrls, i2c_addr) \
+        .driver_info = (SENSOR_ ## sensor << 24) \
+                        | ((flags) << 16) \
+                        | ((nctrls) << 8) \
+                        | (i2c_addr)
 static __devinitdata struct usb_device_id device_table[] = {
 #ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0c45, 0x6001), DVNM("Genius VideoCAM NB")},
-        {USB_DEVICE(0x0c45, 0x6005), DVNM("Sweex Tas5110")},
-        {USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")},
-        {USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")},
-        {USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")},
+        {USB_DEVICE(0x0c45, 0x6001),                    /* SN9C102 */
+                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
+        {USB_DEVICE(0x0c45, 0x6005),                    /* SN9C101 */
+                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
+        {USB_DEVICE(0x0c45, 0x6007),                    /* SN9C101 */
+                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
+        {USB_DEVICE(0x0c45, 0x6009),                    /* SN9C101 */
+                        SFCI(PAS106, F_SIF, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x600d),                    /* SN9C101 */
+                        SFCI(PAS106, F_SIF, 2, 0)},
 #endif
-        {USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")},
+        {USB_DEVICE(0x0c45, 0x6011),            /* SN9C101 - SN9C101G */
+                        SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)},
 #ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")},
-        {USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")},
-        {USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")},
-        {USB_DEVICE(0x0c45, 0x6028), DVNM("Sonix Btc Pc380")},
-        {USB_DEVICE(0x0c45, 0x6029), DVNM("spcaCam@150")},
-        {USB_DEVICE(0x0c45, 0x602c), DVNM("Generic Sonix OV7630")},
-        {USB_DEVICE(0x0c45, 0x602d), DVNM("LIC-200 LG")},
-        {USB_DEVICE(0x0c45, 0x602e), DVNM("Genius VideoCam Messenger")},
-        {USB_DEVICE(0x0c45, 0x60af), DVNM("Trust WB3100P")},
-        {USB_DEVICE(0x0c45, 0x60b0), DVNM("Genius VideoCam Look")},
+        {USB_DEVICE(0x0c45, 0x6019),                    /* SN9C101 */
+                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
+        {USB_DEVICE(0x0c45, 0x6024),                    /* SN9C102 */
+                        SFCI(TAS5130CXX, 0, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x6025),                    /* SN9C102 */
+                        SFCI(TAS5130CXX, 0, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x6028),                    /* SN9C102 */
+                        SFCI(PAS202, 0, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x6029),                    /* SN9C101 */
+                        SFCI(PAS106, F_SIF, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x602c),                    /* SN9C102 */
+                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
+        {USB_DEVICE(0x0c45, 0x602d),                    /* SN9C102 */
+                        SFCI(HV7131R, 0, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x602e),                    /* SN9C102 */
+                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
+        {USB_DEVICE(0x0c45, 0x60af),                    /* SN9C103 */
+                        SFCI(PAS202, F_H18, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x60b0),                    /* SN9C103 */
+                        SFCI(OV7630, F_GAIN|F_AUTO|F_H18, 5, 0x21)},
 #endif
         {}
 };
@@ -1464,7 +1238,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 3e68b9926956..33a3df1f6915 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -24,9 +24,6 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -361,6 +358,7 @@ static const __u8 mo4000_sensor_init[][8] = {
 };
 static const __u8 ov7660_sensor_init[][8] = {
         {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
+/*              (delay 20ms) */
         {0xa1, 0x21, 0x12, 0x05, 0x00, 0x00, 0x00, 0x10},
                                                 /* Outformat ?? rawRGB */
         {0xa1, 0x21, 0x13, 0xb8, 0x00, 0x00, 0x00, 0x10}, /* init COM8 */
@@ -539,13 +537,31 @@ static void reg_r(struct gspca_dev *gspca_dev,
                         value, 0,
                         gspca_dev->usb_buf, len,
                         500);
+        PDEBUG(D_USBI, "reg_r [%02x] -> %02x", value, gspca_dev->usb_buf[0]);
 }
 
+static void reg_w1(struct gspca_dev *gspca_dev,
+                   __u16 value,
+                   __u8 data)
+{
+        PDEBUG(D_USBO, "reg_w1 [%02x] = %02x", value, data);
+        gspca_dev->usb_buf[0] = data;
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x08,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        value,
+                        0,
+                        gspca_dev->usb_buf, 1,
+                        500);
+}
 static void reg_w(struct gspca_dev *gspca_dev,
                           __u16 value,
                           const __u8 *buffer,
                           int len)
 {
+        PDEBUG(D_USBO, "reg_w [%02x] = %02x %02x ..",
+                value, buffer[0], buffer[1]);
         if (len <= sizeof gspca_dev->usb_buf) {
                 memcpy(gspca_dev->usb_buf, buffer, len);
                 usb_control_msg(gspca_dev->dev,
@@ -571,31 +587,42 @@ static void reg_w(struct gspca_dev *gspca_dev,
         }
 }
 
-/* I2C write 2 bytes */
-static void i2c_w2(struct gspca_dev *gspca_dev,
-                   const __u8 *buffer)
+/* I2C write 1 byte */
+static void i2c_w1(struct gspca_dev *gspca_dev, __u8 reg, __u8 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u8 mode[8];
 
-        /* is i2c ready */
-        mode[0] = 0x81 | (2 << 4);
-        mode[1] = sd->i2c_base;
-        mode[2] = buffer[0];
-        mode[3] = buffer[1];
-        mode[4] = 0;
-        mode[5] = 0;
-        mode[6] = 0;
-        mode[7] = 0x10;
-        reg_w(gspca_dev, 0x08, mode, 8);
+        PDEBUG(D_USBO, "i2c_w2 [%02x] = %02x", reg, val);
+        gspca_dev->usb_buf[0] = 0x81 | (2 << 4);        /* = a1 */
+        gspca_dev->usb_buf[1] = sd->i2c_base;
+        gspca_dev->usb_buf[2] = reg;
+        gspca_dev->usb_buf[3] = val;
+        gspca_dev->usb_buf[4] = 0;
+        gspca_dev->usb_buf[5] = 0;
+        gspca_dev->usb_buf[6] = 0;
+        gspca_dev->usb_buf[7] = 0x10;
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x08,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        0x08,                   /* value = i2c */
+                        0,
+                        gspca_dev->usb_buf, 8,
+                        500);
 }
 
 /* I2C write 8 bytes */
 static void i2c_w8(struct gspca_dev *gspca_dev,
                    const __u8 *buffer)
 {
-        reg_w(gspca_dev, 0x08, buffer, 8);
-        msleep(1);
+        memcpy(gspca_dev->usb_buf, buffer, 8);
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x08,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        0x08, 0,                /* value, index */
+                        gspca_dev->usb_buf, 8,
+                        500);
 }
 
 /* read 5 bytes in gspca_dev->usb_buf */
@@ -613,24 +640,21 @@ static void i2c_r5(struct gspca_dev *gspca_dev, __u8 reg)
         mode[6] = 0;
         mode[7] = 0x10;
         i2c_w8(gspca_dev, mode);
+        msleep(2);
         mode[0] = 0x81 | (5 << 4) | 0x02;
         mode[2] = 0;
         i2c_w8(gspca_dev, mode);
+        msleep(2);
         reg_r(gspca_dev, 0x0a, 5);
 }
 
 static int probesensor(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u8 reg02;
-        static const __u8 datasend[] = { 2, 0 };
-        /* reg val1 val2 val3 val4 */
 
-        i2c_w2(gspca_dev, datasend);
-/* should write 0xa1 0x11 0x02 0x00 0x00 0x00 0x00 the 0x10 is add by i2cw */
+        i2c_w1(gspca_dev, 0x02, 0);                     /* sensor wakeup */
         msleep(10);
-        reg02 = 0x66;
-        reg_w(gspca_dev, 0x02, &reg02, 1);              /* Gpio on */
+        reg_w1(gspca_dev, 0x02, 0x66);                  /* Gpio on */
         msleep(10);
         i2c_r5(gspca_dev, 0);                           /* read sensor id */
         if (gspca_dev->usb_buf[0] == 0x02
@@ -642,7 +666,7 @@ static int probesensor(struct gspca_dev *gspca_dev)
                 sd->sensor = SENSOR_HV7131R;
                 return SENSOR_HV7131R;
         }
-        PDEBUG(D_PROBE, "Find Sensor %d %d %d",
+        PDEBUG(D_PROBE, "Find Sensor 0x%02x 0x%02x 0x%02x",
                 gspca_dev->usb_buf[0], gspca_dev->usb_buf[1],
                 gspca_dev->usb_buf[2]);
         PDEBUG(D_PROBE, "Sensor sn9c102P Not found");
@@ -653,8 +677,6 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
                           const __u8 *sn9c1xx)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u8 data;
-        __u8 regF1;
         const __u8 *reg9a;
         static const __u8 reg9a_def[] =
                 {0x08, 0x40, 0x20, 0x10, 0x00, 0x04};
@@ -663,15 +685,13 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
         static const __u8 reg9a_sn9c325[] =
                 {0x0a, 0x40, 0x38, 0x30, 0x00, 0x20};
 
-
-        regF1 = 0x00;
-        reg_w(gspca_dev, 0xf1, &regF1, 1);
-        reg_w(gspca_dev, 0x01, &sn9c1xx[0], 1); /*fixme:jfm was [1] en v1*/
+        reg_w1(gspca_dev, 0xf1, 0x00);
+        reg_w1(gspca_dev, 0x01, sn9c1xx[0]);    /*fixme:jfm was [1] en v1*/
 
         /* configure gpio */
         reg_w(gspca_dev, 0x01, &sn9c1xx[1], 2);
         reg_w(gspca_dev, 0x08, &sn9c1xx[8], 2);
-        reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);      /* jfm was 3 */
+        reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);      /* jfm len was 3 */
         switch (sd->bridge) {
         case BRIDGE_SN9C325:
                 reg9a = reg9a_sn9c325;
@@ -685,35 +705,25 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
         }
         reg_w(gspca_dev, 0x9a, reg9a, 6);
 
-        data = 0x60;                            /*fixme:jfm 60 00 00 (3) */
-        reg_w(gspca_dev, 0xd4, &data, 1);
+        reg_w1(gspca_dev, 0xd4, 0x60);  /*fixme:jfm 60 00 00 (3) ? */
 
         reg_w(gspca_dev, 0x03, &sn9c1xx[3], 0x0f);
 
         switch (sd->bridge) {
         case BRIDGE_SN9C120:                    /* from win trace */
-                data = 0x61;
-                reg_w(gspca_dev, 0x01, &data, 1);
-                data = 0x20;
-                reg_w(gspca_dev, 0x17, &data, 1);
-                data = 0x60;
-                reg_w(gspca_dev, 0x01, &data, 1);
+                reg_w1(gspca_dev, 0x01, 0x61);
+                reg_w1(gspca_dev, 0x17, 0x20);
+                reg_w1(gspca_dev, 0x01, 0x60);
                 break;
         case BRIDGE_SN9C325:
-                data = 0x43;
-                reg_w(gspca_dev, 0x01, &data, 1);
-                data = 0xae;
-                reg_w(gspca_dev, 0x17, &data, 1);
-                data = 0x42;
-                reg_w(gspca_dev, 0x01, &data, 1);
+                reg_w1(gspca_dev, 0x01, 0x43);
+                reg_w1(gspca_dev, 0x17, 0xae);
+                reg_w1(gspca_dev, 0x01, 0x42);
                 break;
         default:
-                data = 0x43;
-                reg_w(gspca_dev, 0x01, &data, 1);
-                data = 0x61;
-                reg_w(gspca_dev, 0x17, &data, 1);
-                data = 0x42;
-                reg_w(gspca_dev, 0x01, &data, 1);
+                reg_w1(gspca_dev, 0x01, 0x43);
+                reg_w1(gspca_dev, 0x17, 0x61);
+                reg_w1(gspca_dev, 0x01, 0x42);
         }
 
         if (sd->sensor == SENSOR_HV7131R) {
@@ -770,6 +780,9 @@ static void ov7660_InitSensor(struct gspca_dev *gspca_dev)
 {
         int i = 0;
 
+        i2c_w8(gspca_dev, ov7660_sensor_init[i]);       /* reset SCCB */
+        i++;
+        msleep(20);
         while (ov7660_sensor_init[i][0]) {
                 i2c_w8(gspca_dev, ov7660_sensor_init[i]);
                 i++;
@@ -782,194 +795,16 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-        sd->sensor = -1;
-        switch (vendor) {
-        case 0x0458:                            /* Genius */
-/*              switch (product) {
-                case 0x7025: */
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_MI0360;
-                        sd->i2c_base = 0x5d;
-/*                      break;
-                } */
-                break;
-        case 0x045e:
-/*              switch (product) {
-                case 0x00f5:
-                case 0x00f7: */
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_OV7660;
-                        sd->i2c_base = 0x21;
-/*                      break;
-                } */
-                break;
-        case 0x0471:                            /* Philips */
-/*              switch (product) {
-                case 0x0327:
-                case 0x0328:
-                case 0x0330: */
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_MI0360;
-                        sd->i2c_base = 0x5d;
-/*                      break;
-                } */
-                break;
-        case 0x0c45:                            /* Sonix */
-                switch (product) {
-                case 0x6040:
-                        sd->bridge = BRIDGE_SN9C102P;
-/*                      sd->sensor = SENSOR_MI0360;      * from BW600.inf */
-/*fixme: MI0360 base=5d ? */
-                        sd->sensor = SENSOR_HV7131R;    /* gspcav1 value */
-                        sd->i2c_base = 0x11;
-                        break;
-/*              case 0x607a:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C102P;
-                        sd->sensor = SENSOR_OV7648;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x607c:
-                        sd->bridge = BRIDGE_SN9C102P;
-                        sd->sensor = SENSOR_HV7131R;
-                        sd->i2c_base = 0x11;
-                        break;
-/*              case 0x607e:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C102P;
-                        sd->sensor = SENSOR_OV7630;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x60c0:
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_MI0360;
-                        sd->i2c_base = 0x5d;
-                        break;
-/*              case 0x60c8:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_OM6801;
-                        sd->i2c_base = 0x??;
-                        break; */
-/*              case 0x60cc:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_HV7131GP;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x60ec:
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_MO4000;
-                        sd->i2c_base = 0x21;
-                        break;
-/*              case 0x60ef:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_ICM105C;
-                        sd->i2c_base = 0x??;
-                        break; */
-/*              case 0x60fa:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_OV7648;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x60fb:
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_OV7660;
-                        sd->i2c_base = 0x21;
-                        break;
-                case 0x60fc:
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_HV7131R;
-                        sd->i2c_base = 0x11;
-                        break;
-/*              case 0x60fe:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C105;
-                        sd->sensor = SENSOR_OV7630;
-                        sd->i2c_base = 0x??;
-                        break; */
-/*              case 0x6108:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_OM6801;
-                        sd->i2c_base = 0x??;
-                        break; */
-/*              case 0x6122:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C110;
-                        sd->sensor = SENSOR_ICM105C;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x612a:
-/*                      sd->bridge = BRIDGE_SN9C110;     * in BW600.inf */
-                        sd->bridge = BRIDGE_SN9C325;
-                        sd->sensor = SENSOR_OV7648;
-                        sd->i2c_base = 0x21;
-/*fixme: sensor_init has base = 00 et 6e!*/
-                        break;
-/*              case 0x6123:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C110;
-                        sd->sensor = SENSOR_SanyoCCD;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x612c:
-                        sd->bridge = BRIDGE_SN9C110;
-                        sd->sensor = SENSOR_MO4000;
-                        sd->i2c_base = 0x21;
-                        break;
-/*              case 0x612e:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C110;
-                        sd->sensor = SENSOR_OV7630;
-                        sd->i2c_base = 0x??;
-                        break; */
-/*              case 0x612f:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C110;
-                        sd->sensor = SENSOR_ICM105C;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x6130:
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_MI0360;
-                        sd->i2c_base = 0x5d;
-                        break;
-                case 0x6138:
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_MO4000;
-                        sd->i2c_base = 0x21;
-                        break;
-/*              case 0x613a:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_OV7648;
-                        sd->i2c_base = 0x??;
-                        break; */
-                case 0x613b:
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_OV7660;
-                        sd->i2c_base = 0x21;
-                        break;
-                case 0x613c:
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_HV7131R;
-                        sd->i2c_base = 0x11;
-                        break;
-/*              case 0x613e:                            * from BW600.inf
-                        sd->bridge = BRIDGE_SN9C120;
-                        sd->sensor = SENSOR_OV7630;
-                        sd->i2c_base = 0x??;
-                        break; */
-                }
-                break;
-        }
-        if (sd->sensor < 0) {
-                PDEBUG(D_ERR, "Invalid vendor/product %04x:%04x",
-                        vendor, product);
-                return -EINVAL;
-        }
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
 
+        sd->bridge = id->driver_info >> 16;
+        sd->sensor = id->driver_info >> 8;
+        sd->i2c_base = id->driver_info;
+
         sd->qindex = 4;                 /* set the quantization table */
         sd->brightness = BRIGHTNESS_DEF;
         sd->contrast = CONTRAST_DEF;
@@ -983,34 +818,26 @@ static int sd_open(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 /*      const __u8 *sn9c1xx; */
-        __u8 regF1;
         __u8 regGpio[] = { 0x29, 0x74 };
+        __u8 regF1;
 
         /* setup a selector by bridge */
-        regF1 = 0x01;
-        reg_w(gspca_dev, 0xf1, &regF1, 1);
+        reg_w1(gspca_dev, 0xf1, 0x01);
         reg_r(gspca_dev, 0x00, 1);              /* -> regF1 = 0x00 */
-        regF1 = gspca_dev->usb_buf[0];
-        reg_w(gspca_dev, 0xf1, &regF1, 1);
+        reg_w1(gspca_dev, 0xf1, gspca_dev->usb_buf[0]);
         reg_r(gspca_dev, 0x00, 1);
         regF1 = gspca_dev->usb_buf[0];
         switch (sd->bridge) {
         case BRIDGE_SN9C102P:
                 if (regF1 != 0x11)
                         return -ENODEV;
-                reg_w(gspca_dev, 0x02, &regGpio[1], 1);
+                reg_w1(gspca_dev, 0x02, regGpio[1]);
                 break;
         case BRIDGE_SN9C105:
                 if (regF1 != 0x11)
                         return -ENODEV;
                 reg_w(gspca_dev, 0x02, regGpio, 2);
                 break;
-        case BRIDGE_SN9C110:
-                if (regF1 != 0x12)
-                        return -ENODEV;
-                regGpio[1] = 0x62;
-                reg_w(gspca_dev, 0x02, &regGpio[1], 1);
-                break;
         case BRIDGE_SN9C120:
                 if (regF1 != 0x12)
                         return -ENODEV;
@@ -1018,16 +845,15 @@ static int sd_open(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x02, regGpio, 2);
                 break;
         default:
+/*      case BRIDGE_SN9C110: */
 /*      case BRIDGE_SN9C325: */
                 if (regF1 != 0x12)
                         return -ENODEV;
-                regGpio[1] = 0x62;
-                reg_w(gspca_dev, 0x02, &regGpio[1], 1);
+                reg_w1(gspca_dev, 0x02, 0x62);
                 break;
         }
 
-        regF1 = 0x01;
-        reg_w(gspca_dev, 0xf1, &regF1, 1);
+        reg_w1(gspca_dev, 0xf1, 0x01);
 
         return 0;
 }
@@ -1123,7 +949,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         }
 
         k2 = sd->brightness >> 10;
-        reg_w(gspca_dev, 0x96, &k2, 1);
+        reg_w1(gspca_dev, 0x96, k2);
 }
 
 static void setcontrast(struct gspca_dev *gspca_dev)
@@ -1152,7 +978,7 @@ static void setcolors(struct gspca_dev *gspca_dev)
                 data = (colour + 32) & 0x7f;    /* blue */
         else
                 data = (-colour + 32) & 0x7f;   /* red */
-        reg_w(gspca_dev, 0x05, &data, 1);
+        reg_w1(gspca_dev, 0x05, data);
 }
 
 /* -- start the camera -- */
@@ -1165,7 +991,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
         __u8 reg17;
         const __u8 *sn9c1xx;
         int mode;
-        static const __u8 DC29[] = { 0x6a, 0x50, 0x00, 0x00, 0x50, 0x3c };
         static const __u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };
         static const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };
         static const __u8 CA_sn9c120[] =
@@ -1179,21 +1004,20 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
 /*fixme:jfm this sequence should appear at end of sd_start */
 /* with
-        data = 0x44;
-        reg_w(gspca_dev, 0x01, &data, 1); */
-        reg_w(gspca_dev, 0x15, &sn9c1xx[0x15], 1);
-        reg_w(gspca_dev, 0x16, &sn9c1xx[0x16], 1);
-        reg_w(gspca_dev, 0x12, &sn9c1xx[0x12], 1);
-        reg_w(gspca_dev, 0x13, &sn9c1xx[0x13], 1);
-        reg_w(gspca_dev, 0x18, &sn9c1xx[0x18], 1);
-        reg_w(gspca_dev, 0xd2, &DC29[0], 1);
-        reg_w(gspca_dev, 0xd3, &DC29[1], 1);
-        reg_w(gspca_dev, 0xc6, &DC29[2], 1);
-        reg_w(gspca_dev, 0xc7, &DC29[3], 1);
-        reg_w(gspca_dev, 0xc8, &DC29[4], 1);
-        reg_w(gspca_dev, 0xc9, &DC29[5], 1);
+        reg_w1(gspca_dev, 0x01, 0x44); */
+        reg_w1(gspca_dev, 0x15, sn9c1xx[0x15]);
+        reg_w1(gspca_dev, 0x16, sn9c1xx[0x16]);
+        reg_w1(gspca_dev, 0x12, sn9c1xx[0x12]);
+        reg_w1(gspca_dev, 0x13, sn9c1xx[0x13]);
+        reg_w1(gspca_dev, 0x18, sn9c1xx[0x18]);
+        reg_w1(gspca_dev, 0xd2, 0x6a);          /* DC29 */
+        reg_w1(gspca_dev, 0xd3, 0x50);
+        reg_w1(gspca_dev, 0xc6, 0x00);
+        reg_w1(gspca_dev, 0xc7, 0x00);
+        reg_w1(gspca_dev, 0xc8, 0x50);
+        reg_w1(gspca_dev, 0xc9, 0x3c);
 /*fixme:jfm end of ending sequence */
-        reg_w(gspca_dev, 0x18, &sn9c1xx[0x18], 1);
+        reg_w1(gspca_dev, 0x18, sn9c1xx[0x18]);
         switch (sd->bridge) {
         case BRIDGE_SN9C325:
                 data = 0xae;
@@ -1205,11 +1029,11 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 data = 0x60;
                 break;
         }
-        reg_w(gspca_dev, 0x17, &data, 1);
-        reg_w(gspca_dev, 0x05, &sn9c1xx[5], 1);
-        reg_w(gspca_dev, 0x07, &sn9c1xx[7], 1);
-        reg_w(gspca_dev, 0x06, &sn9c1xx[6], 1);
-        reg_w(gspca_dev, 0x14, &sn9c1xx[0x14], 1);
+        reg_w1(gspca_dev, 0x17, data);
+        reg_w1(gspca_dev, 0x05, sn9c1xx[5]);
+        reg_w1(gspca_dev, 0x07, sn9c1xx[7]);
+        reg_w1(gspca_dev, 0x06, sn9c1xx[6]);
+        reg_w1(gspca_dev, 0x14, sn9c1xx[0x14]);
         switch (sd->bridge) {
         case BRIDGE_SN9C325:
                 reg_w(gspca_dev, 0x20, regsn20_sn9c325,
@@ -1217,10 +1041,8 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 for (i = 0; i < 8; i++)
                         reg_w(gspca_dev, 0x84, reg84_sn9c325,
                                         sizeof reg84_sn9c325);
-                data = 0x0a;
-                reg_w(gspca_dev, 0x9a, &data, 1);
-                data = 0x60;
-                reg_w(gspca_dev, 0x99, &data, 1);
+                reg_w1(gspca_dev, 0x9a, 0x0a);
+                reg_w1(gspca_dev, 0x99, 0x60);
                 break;
         case BRIDGE_SN9C120:
                 reg_w(gspca_dev, 0x20, regsn20_sn9c120,
@@ -1233,39 +1055,30 @@ static void sd_start(struct gspca_dev *gspca_dev)
                                         sizeof reg84_sn9c120_2);
                 reg_w(gspca_dev, 0x84, reg84_sn9c120_3,
                                 sizeof reg84_sn9c120_3);
-                data = 0x05;
-                reg_w(gspca_dev, 0x9a, &data, 1);
-                data = 0x5b;
-                reg_w(gspca_dev, 0x99, &data, 1);
+                reg_w1(gspca_dev, 0x9a, 0x05);
+                reg_w1(gspca_dev, 0x99, 0x5b);
                 break;
         default:
                 reg_w(gspca_dev, 0x20, regsn20, sizeof regsn20);
                 for (i = 0; i < 8; i++)
                         reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
-                data = 0x08;
-                reg_w(gspca_dev, 0x9a, &data, 1);
-                data = 0x59;
-                reg_w(gspca_dev, 0x99, &data, 1);
+                reg_w1(gspca_dev, 0x9a, 0x08);
+                reg_w1(gspca_dev, 0x99, 0x59);
                 break;
         }
 
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
-        reg1 = 0x02;
+        if (mode)
+                reg1 = 0x46;    /* 320 clk 48Mhz */
+        else
+                reg1 = 0x06;    /* 640 clk 24Mz */
         reg17 = 0x61;
         switch (sd->sensor) {
         case SENSOR_HV7131R:
                 hv7131R_InitSensor(gspca_dev);
-                if (mode)
-                        reg1 = 0x46;    /* 320 clk 48Mhz */
-                else
-                        reg1 = 0x06;    /* 640 clk 24Mz */
                 break;
         case SENSOR_MI0360:
                 mi0360_InitSensor(gspca_dev);
-                if (mode)
-                        reg1 = 0x46;    /* 320 clk 48Mhz */
-                else
-                        reg1 = 0x06;    /* 640 clk 24Mz */
                 break;
         case SENSOR_MO4000:
                 mo4000_InitSensor(gspca_dev);
@@ -1274,13 +1087,13 @@ static void sd_start(struct gspca_dev *gspca_dev)
                         reg1 = 0x06;    /* clk 24Mz */
                 } else {
                         reg17 = 0x22;   /* 640 MCKSIZE */
-                        reg1 = 0x06;    /* 640 clk 24Mz */
+/*                      reg1 = 0x06;     * 640 clk 24Mz (done) */
                 }
                 break;
         case SENSOR_OV7648:
+                ov7648_InitSensor(gspca_dev);
                 reg17 = 0xa2;
                 reg1 = 0x44;
-                ov7648_InitSensor(gspca_dev);
 /*              if (mode)
                         ;                * 320x2...
                 else
@@ -1292,7 +1105,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 if (mode) {
 /*                      reg17 = 0x21;    * 320 */
 /*                      reg1 = 0x44; */
-                        reg1 = 0x46;
+/*                      reg1 = 0x46;    (done) */
                 } else {
                         reg17 = 0xa2;   /* 640 */
                         reg1 = 0x40;
@@ -1321,16 +1134,16 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         /* here change size mode 0 -> VGA; 1 -> CIF */
         data = 0x40 | sn9c1xx[0x18] | (mode << 4);
-        reg_w(gspca_dev, 0x18, &data, 1);
+        reg_w1(gspca_dev, 0x18, data);
 
         reg_w(gspca_dev, 0x100, qtable4, 0x40);
         reg_w(gspca_dev, 0x140, qtable4 + 0x40, 0x40);
 
         data = sn9c1xx[0x18] | (mode << 4);
-        reg_w(gspca_dev, 0x18, &data, 1);
+        reg_w1(gspca_dev, 0x18, data);
 
-        reg_w(gspca_dev, 0x17, &reg17, 1);
-        reg_w(gspca_dev, 0x01, &reg1, 1);
+        reg_w1(gspca_dev, 0x17, reg17);
+        reg_w1(gspca_dev, 0x01, reg1);
         setbrightness(gspca_dev);
         setcontrast(gspca_dev);
 }
@@ -1342,7 +1155,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 { 0xa1, 0x11, 0x02, 0x09, 0x00, 0x00, 0x00, 0x10 };
         static const __u8 stopmi0360[] =
                 { 0xb1, 0x5d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10 };
-        __u8 regF1;
         __u8 data;
         const __u8 *sn9c1xx;
 
@@ -1366,12 +1178,11 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 break;
         }
         sn9c1xx = sn_tb[(int) sd->sensor];
-        reg_w(gspca_dev, 0x01, &sn9c1xx[1], 1);
-        reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 1);
-        reg_w(gspca_dev, 0x01, &sn9c1xx[1], 1);
-        reg_w(gspca_dev, 0x01, &data, 1);
-        regF1 = 0x01;
-        reg_w(gspca_dev, 0xf1, &regF1, 1);
+        reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
+        reg_w1(gspca_dev, 0x17, sn9c1xx[0x17]);
+        reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
+        reg_w1(gspca_dev, 0x01, data);
+        reg_w1(gspca_dev, 0xf1, 0x01);
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
@@ -1610,30 +1421,53 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
+#define BSI(bridge, sensor, i2c_addr) \
+        .driver_info = (BRIDGE_ ## bridge << 16) \
+                        | (SENSOR_ ## sensor << 8) \
+                        | (i2c_addr)
 static const __devinitdata struct usb_device_id device_table[] = {
 #ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0458, 0x7025), DVNM("Genius Eye 311Q")},
-        {USB_DEVICE(0x045e, 0x00f5), DVNM("MicroSoft VX3000")},
-        {USB_DEVICE(0x045e, 0x00f7), DVNM("MicroSoft VX1000")},
-        {USB_DEVICE(0x0471, 0x0327), DVNM("Philips SPC 600 NC")},
-        {USB_DEVICE(0x0471, 0x0328), DVNM("Philips SPC 700 NC")},
+        {USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},
+        {USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},
+        {USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},
+        {USB_DEVICE(0x0471, 0x0327), BSI(SN9C105, MI0360, 0x5d)},
+        {USB_DEVICE(0x0471, 0x0328), BSI(SN9C105, MI0360, 0x5d)},
 #endif
-        {USB_DEVICE(0x0471, 0x0330), DVNM("Philips SPC 710NC")},
-        {USB_DEVICE(0x0c45, 0x6040), DVNM("Speed NVC 350K")},
-        {USB_DEVICE(0x0c45, 0x607c), DVNM("Sonix sn9c102p Hv7131R")},
-        {USB_DEVICE(0x0c45, 0x60c0), DVNM("Sangha Sn535")},
-        {USB_DEVICE(0x0c45, 0x60ec), DVNM("SN9C105+MO4000")},
-        {USB_DEVICE(0x0c45, 0x60fb), DVNM("Surfer NoName")},
-        {USB_DEVICE(0x0c45, 0x60fc), DVNM("LG-LIC300")},
-        {USB_DEVICE(0x0c45, 0x612a), DVNM("Avant Camera")},
-        {USB_DEVICE(0x0c45, 0x612c), DVNM("Typhoon Rasy Cam 1.3MPix")},
+        {USB_DEVICE(0x0471, 0x0330), BSI(SN9C105, MI0360, 0x5d)},
+        {USB_DEVICE(0x0c45, 0x6040), BSI(SN9C102P, HV7131R, 0x11)},
+/* bw600.inf:
+        {USB_DEVICE(0x0c45, 0x6040), BSI(SN9C102P, MI0360, 0x5d)}, */
+/*      {USB_DEVICE(0x0c45, 0x603a), BSI(SN9C102P, OV7648, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x607a), BSI(SN9C102P, OV7648, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x607c), BSI(SN9C102P, HV7131R, 0x11)},
+/*      {USB_DEVICE(0x0c45, 0x607e), BSI(SN9C102P, OV7630, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x60c0), BSI(SN9C105, MI0360, 0x5d)},
+/*      {USB_DEVICE(0x0c45, 0x60c8), BSI(SN9C105, OM6801, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x60cc), BSI(SN9C105, HV7131GP, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x60ec), BSI(SN9C105, MO4000, 0x21)},
+/*      {USB_DEVICE(0x0c45, 0x60ef), BSI(SN9C105, ICM105C, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x60fa), BSI(SN9C105, OV7648, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x60fb), BSI(SN9C105, OV7660, 0x21)},
+        {USB_DEVICE(0x0c45, 0x60fc), BSI(SN9C105, HV7131R, 0x11)},
+/*      {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C325, OV7648, 0x21)},
+/* bw600.inf:
+        {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, */
+        {USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)},
+/*      {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x??)}, */
+/*      {USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */
 #ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0c45, 0x6130), DVNM("Sonix Pccam")},
-        {USB_DEVICE(0x0c45, 0x6138), DVNM("Sn9c120 Mo4000")},
-        {USB_DEVICE(0x0c45, 0x613b), DVNM("Surfer SN-206")},
-        {USB_DEVICE(0x0c45, 0x613c), DVNM("Sonix Pccam168")},
+        {USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)},
+        {USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)},
+/*      {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)},
+        {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},
+/*      {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x??)}, */
 #endif
+        {USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, MI0360, 0x5d)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1658,7 +1492,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        info("v%s registered", version);
+        info("registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 156206118795..17fe2c2a440d 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -24,9 +24,6 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA500 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -630,109 +627,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-        switch (vendor) {
-        case 0x040a:            /* Kodak cameras */
-/*              switch (product) { */
-/*              case 0x0300: */
-                        sd->subtype = KodakEZ200;
-/*                      break; */
-/*              } */
-                break;
-        case 0x041e:            /* Creative cameras */
-/*              switch (product) { */
-/*              case 0x400a: */
-                        sd->subtype = CreativePCCam300;
-/*                      break; */
-/*              } */
-                break;
-        case 0x046d:            /* Logitech Labtec */
-                switch (product) {
-                case 0x0890:
-                        sd->subtype = LogitechTraveler;
-                        break;
-                case 0x0900:
-                        sd->subtype = LogitechClickSmart310;
-                        break;
-                case 0x0901:
-                        sd->subtype = LogitechClickSmart510;
-                        break;
-                }
-                break;
-        case 0x04a5:            /* Benq */
-/*              switch (product) { */
-/*              case 0x300c: */
-                        sd->subtype = BenqDC1016;
-/*                      break; */
-/*              } */
-                break;
-        case 0x04fc:            /* SunPlus */
-/*              switch (product) { */
-/*              case 0x7333: */
-                        sd->subtype = PalmPixDC85;
-/*                      break; */
-/*              } */
-                break;
-        case 0x055f:            /* Mustek cameras */
-                switch (product) {
-                case 0xc200:
-                        sd->subtype = MustekGsmart300;
-                        break;
-                case 0xc220:
-                        sd->subtype = Gsmartmini;
-                        break;
-                }
-                break;
-        case 0x06bd:            /* Agfa Cl20 */
-/*              switch (product) { */
-/*              case 0x0404: */
-                        sd->subtype = AgfaCl20;
-/*                      break; */
-/*              } */
-                break;
-        case 0x06be:            /* Optimedia */
-/*              switch (product) { */
-/*              case 0x0800: */
-                        sd->subtype = Optimedia;
-/*                      break; */
-/*              } */
-                break;
-        case 0x084d:            /* D-Link / Minton */
-/*              switch (product) { */
-/*              case 0x0003:     * DSC-350 / S-Cam F5 */
-                        sd->subtype = DLinkDSC350;
-/*                      break; */
-/*              } */
-                break;
-        case 0x08ca:            /* Aiptek */
-/*              switch (product) { */
-/*              case 0x0103: */
-                        sd->subtype = AiptekPocketDV;
-/*                      break; */
-/*              } */
-                break;
-        case 0x2899:            /* ToptroIndustrial */
-/*              switch (product) { */
-/*              case 0x012c: */
-                        sd->subtype = ToptroIndus;
-/*                      break; */
-/*              } */
-                break;
-        case 0x8086:            /* Intel */
-/*              switch (product) { */
-/*              case 0x0630:     * Pocket PC Camera */
-                        sd->subtype = IntelPocketPCCamera;
-/*                      break; */
-/*              } */
-                break;
-        }
+
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
+        sd->subtype = id->driver_info;
         if (sd->subtype != LogitechClickSmart310) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
@@ -1162,23 +1060,22 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x040a, 0x0300), DVNM("Kodak EZ200")},
-        {USB_DEVICE(0x041e, 0x400a), DVNM("Creative PC-CAM 300")},
-        {USB_DEVICE(0x046d, 0x0890), DVNM("Logitech QuickCam traveler")},
-        {USB_DEVICE(0x046d, 0x0900), DVNM("Logitech Inc. ClickSmart 310")},
-        {USB_DEVICE(0x046d, 0x0901), DVNM("Logitech Inc. ClickSmart 510")},
-        {USB_DEVICE(0x04a5, 0x300c), DVNM("Benq DC1016")},
-        {USB_DEVICE(0x04fc, 0x7333), DVNM("PalmPixDC85")},
-        {USB_DEVICE(0x055f, 0xc200), DVNM("Mustek Gsmart 300")},
-        {USB_DEVICE(0x055f, 0xc220), DVNM("Gsmart Mini")},
-        {USB_DEVICE(0x06bd, 0x0404), DVNM("Agfa CL20")},
-        {USB_DEVICE(0x06be, 0x0800), DVNM("Optimedia")},
-        {USB_DEVICE(0x084d, 0x0003), DVNM("D-Link DSC-350")},
-        {USB_DEVICE(0x08ca, 0x0103), DVNM("Aiptek PocketDV")},
-        {USB_DEVICE(0x2899, 0x012c), DVNM("Toptro Industrial")},
-        {USB_DEVICE(0x8086, 0x0630), DVNM("Intel Pocket PC Camera")},
+        {USB_DEVICE(0x040a, 0x0300), .driver_info = KodakEZ200},
+        {USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},
+        {USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},
+        {USB_DEVICE(0x046d, 0x0900), .driver_info = LogitechClickSmart310},
+        {USB_DEVICE(0x046d, 0x0901), .driver_info = LogitechClickSmart510},
+        {USB_DEVICE(0x04a5, 0x300c), .driver_info = BenqDC1016},
+        {USB_DEVICE(0x04fc, 0x7333), .driver_info = PalmPixDC85},
+        {USB_DEVICE(0x055f, 0xc200), .driver_info = MustekGsmart300},
+        {USB_DEVICE(0x055f, 0xc220), .driver_info = Gsmartmini},
+        {USB_DEVICE(0x06bd, 0x0404), .driver_info = AgfaCl20},
+        {USB_DEVICE(0x06be, 0x0800), .driver_info = Optimedia},
+        {USB_DEVICE(0x084d, 0x0003), .driver_info = DLinkDSC350},
+        {USB_DEVICE(0x08ca, 0x0103), .driver_info = AiptekPocketDV},
+        {USB_DEVICE(0x2899, 0x012c), .driver_info = ToptroIndus},
+        {USB_DEVICE(0x8086, 0x0630), .driver_info = IntelPocketPCCamera},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1203,7 +1100,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 50e929de0203..51a3c3429ef0 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -23,9 +23,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA501 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -1923,63 +1920,12 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-        switch (vendor) {
-        case 0x0000:            /* Unknow Camera */
-/*              switch (product) { */
-/*              case 0x0000: */
-                        sd->subtype = MystFromOriUnknownCamera;
-/*                      break; */
-/*              } */
-                break;
-        case 0x040a:            /* Kodak cameras */
-/*              switch (product) { */
-/*              case 0x0002: */
-                        sd->subtype = KodakDVC325;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0497:            /* Smile International */
-/*              switch (product) { */
-/*              case 0xc001: */
-                        sd->subtype = SmileIntlCamera;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0506:            /* 3COM cameras */
-/*              switch (product) { */
-/*              case 0x00df: */
-                        sd->subtype = ThreeComHomeConnectLite;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0733:    /* Rebadged ViewQuest (Intel) and ViewQuest cameras */
-                switch (product) {
-                case 0x0401:
-                        sd->subtype = IntelCreateAndShare;
-                        break;
-                case 0x0402:
-                        sd->subtype = ViewQuestM318B;
-                        break;
-                }
-                break;
-        case 0x1776:            /* Arowana */
-/*              switch (product) { */
-/*              case 0x501c: */
-                        sd->subtype = Arowana300KCMOSCamera;
-/*                      break; */
-/*              } */
-                break;
-        }
+
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
+        sd->subtype = id->driver_info;
         sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;
         sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;
         sd->colors = sd_ctrls[MY_COLOR].qctrl.default_value;
@@ -2183,15 +2129,14 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x040a, 0x0002), DVNM("Kodak DVC-325")},
-        {USB_DEVICE(0x0497, 0xc001), DVNM("Smile International")},
-        {USB_DEVICE(0x0506, 0x00df), DVNM("3Com HomeConnect Lite")},
-        {USB_DEVICE(0x0733, 0x0401), DVNM("Intel Create and Share")},
-        {USB_DEVICE(0x0733, 0x0402), DVNM("ViewQuest M318B")},
-        {USB_DEVICE(0x1776, 0x501c), DVNM("Arowana 300K CMOS Camera")},
-        {USB_DEVICE(0x0000, 0x0000), DVNM("MystFromOri Unknow Camera")},
+        {USB_DEVICE(0x040a, 0x0002), .driver_info = KodakDVC325},
+        {USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},
+        {USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},
+        {USB_DEVICE(0x0733, 0x0401), .driver_info = IntelCreateAndShare},
+        {USB_DEVICE(0x0733, 0x0402), .driver_info = ViewQuestM318B},
+        {USB_DEVICE(0x1776, 0x501c), .driver_info = Arowana300KCMOSCamera},
+        {USB_DEVICE(0x0000, 0x0000), .driver_info = MystFromOriUnknownCamera},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -2216,7 +2161,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index ddea6e140aa8..3c2be80cbd65 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -23,9 +23,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA505 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -34,10 +31,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        int buflen;
-        unsigned char tmpbuf[640 * 480 * 3 / 2]; /* YYUV per line */
-        unsigned char tmpbuf2[640 * 480 * 2];   /* YUYV */
-
         unsigned char brightness;
 
         char subtype;
@@ -67,29 +60,29 @@ static struct ctrl sd_ctrls[] = {
 };
 
 static struct v4l2_pix_format vga_mode[] = {
-        {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 160 * 2,
-                .sizeimage = 160 * 120 * 2,
+        {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 160 * 3,
+                .sizeimage = 160 * 120 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 5},
-        {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 176 * 2,
-                .sizeimage = 176 * 144 * 2,
+        {176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 176 * 3,
+                .sizeimage = 176 * 144 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 4},
-        {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 320 * 2,
-                .sizeimage = 320 * 240 * 2,
+        {320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 320 * 3,
+                .sizeimage = 320 * 240 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 2},
-        {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 352 * 2,
-                .sizeimage = 352 * 288 * 2,
+        {352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 352 * 3,
+                .sizeimage = 352 * 288 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
-        {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 640 * 2,
-                .sizeimage = 640 * 480 * 2,
+        {640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 640 * 3,
+                .sizeimage = 640 * 480 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
@@ -641,33 +634,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-        switch (vendor) {
-        case 0x041e:            /* Creative cameras */
-/*              switch (product) { */
-/*              case 0x401d:     * here505b */
-                        sd->subtype = Nxultra;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0733:    /* Rebadged ViewQuest (Intel) and ViewQuest cameras */
-/*              switch (product) { */
-/*              case 0x0430: */
-/*              fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
-                        sd->subtype = IntelPCCameraPro;
-/*                      break; */
-/*              } */
-                break;
-        }
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
+        sd->subtype = id->driver_info;
         if (sd->subtype != IntelPCCameraPro)
                 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
         else                    /* no 640x480 for IntelPCCameraPro */
@@ -785,77 +756,30 @@ static void sd_close(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, 0x05, 0x11, 0xf);
 }
 
-/* convert YYUV per line to YUYV (YUV 4:2:2) */
-static void yyuv_decode(unsigned char *out,
-                        unsigned char *in,
-                        int width,
-                        int height)
-{
-        unsigned char *Ui, *Vi, *yi, *yi1;
-        unsigned char *out1;
-        int i, j;
-
-        yi = in;
-        for (i = height / 2; --i >= 0; ) {
-                out1 = out + width * 2;         /* next line */
-                yi1 = yi + width;
-                Ui = yi1 + width;
-                Vi = Ui + width / 2;
-                for (j = width / 2; --j >= 0; ) {
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Ui;
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Vi;
-
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Ui++;
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Vi++;
-                }
-                yi += width * 2;
-                out = out1;
-        }
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
                         int len)                        /* iso packet length */
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         switch (data[0]) {
         case 0:                         /* start of frame */
-                if (gspca_dev->last_packet_type == FIRST_PACKET) {
-                        yyuv_decode(sd->tmpbuf2, sd->tmpbuf,
-                                        gspca_dev->width,
-                                        gspca_dev->height);
-                        frame = gspca_frame_add(gspca_dev,
-                                                LAST_PACKET,
-                                                frame,
-                                                sd->tmpbuf2,
-                                                gspca_dev->width
-                                                        * gspca_dev->height
-                                                        * 2);
-                }
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                data, 0);
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        data, 0);
                 data += SPCA50X_OFFSET_DATA;
                 len -= SPCA50X_OFFSET_DATA;
-                if (len > 0)
-                        memcpy(sd->tmpbuf, data, len);
-                else
-                        len = 0;
-                sd->buflen = len;
-                return;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         case 0xff:                      /* drop */
 /*              gspca_dev->last_packet_type = DISCARD_PACKET; */
-                return;
+                break;
+        default:
+                data += 1;
+                len -= 1;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         }
-        data += 1;
-        len -= 1;
-        memcpy(&sd->tmpbuf[sd->buflen], data, len);
-        sd->buflen += len;
 }
 
 static void setbrightness(struct gspca_dev *gspca_dev)
@@ -910,10 +834,10 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x401d), DVNM("Creative Webcam NX ULTRA")},
-        {USB_DEVICE(0x0733, 0x0430), DVNM("Intel PC Camera Pro")},
+        {USB_DEVICE(0x041e, 0x401d), .driver_info = Nxultra},
+        {USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},
+/*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -938,7 +862,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 143203c1fd9f..6fe715c80ad2 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -25,9 +25,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA506 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -36,10 +33,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        int buflen;
-        __u8 tmpbuf[640 * 480 * 3];     /* YYUV per line */
-        __u8 tmpbuf2[640 * 480 * 2];    /* YUYV */
-
         unsigned char brightness;
         unsigned char contrast;
         unsigned char colors;
@@ -118,29 +111,29 @@ static struct ctrl sd_ctrls[] = {
 };
 
 static struct v4l2_pix_format vga_mode[] = {
-        {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 160 * 2,
-                .sizeimage = 160 * 120 * 2,
+        {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 160 * 3,
+                .sizeimage = 160 * 120 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 5},
-        {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 176 * 2,
-                .sizeimage = 176 * 144 * 2,
+        {176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 176 * 3,
+                .sizeimage = 176 * 144 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 4},
-        {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 320 * 2,
-                .sizeimage = 320 * 240 * 2,
+        {320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 320 * 3,
+                .sizeimage = 320 * 240 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 2},
-        {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 352 * 2,
-                .sizeimage = 352 * 288 * 2,
+        {352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 352 * 3,
+                .sizeimage = 352 * 288 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
-        {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 640 * 2,
-                .sizeimage = 640 * 480 * 2,
+        {640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+                .bytesperline = 640 * 3,
+                .sizeimage = 640 * 480 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
@@ -310,7 +303,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
@@ -576,77 +568,30 @@ static void sd_close(struct gspca_dev *gspca_dev)
 {
 }
 
-/* convert YYUV per line to YUYV (YUV 4:2:2) */
-static void yyuv_decode(unsigned char *out,
-                        unsigned char *in,
-                        int width,
-                        int height)
-{
-        unsigned char *Ui, *Vi, *yi, *yi1;
-        unsigned char *out1;
-        int i, j;
-
-        yi = in;
-        for (i = height / 2; --i >= 0; ) {
-                out1 = out + width * 2;         /* next line */
-                yi1 = yi + width;
-                Ui = yi1 + width;
-                Vi = Ui + width / 2;
-                for (j = width / 2; --j >= 0; ) {
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Ui;
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Vi;
-
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Ui++;
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Vi++;
-                }
-                yi += width * 2;
-                out = out1;
-        }
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
                         int len)                        /* iso packet length */
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         switch (data[0]) {
         case 0:                         /* start of frame */
-                if (gspca_dev->last_packet_type == FIRST_PACKET) {
-                        yyuv_decode(sd->tmpbuf2, sd->tmpbuf,
-                                        gspca_dev->width,
-                                        gspca_dev->height);
-                        frame = gspca_frame_add(gspca_dev,
-                                                LAST_PACKET,
-                                                frame,
-                                                sd->tmpbuf2,
-                                                gspca_dev->width
-                                                        * gspca_dev->height
-                                                        * 2);
-                }
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                data, 0);
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        data, 0);
                 data += SPCA50X_OFFSET_DATA;
                 len -= SPCA50X_OFFSET_DATA;
-                if (len > 0)
-                        memcpy(sd->tmpbuf, data, len);
-                else
-                        len = 0;
-                sd->buflen = len;
-                return;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         case 0xff:                      /* drop */
 /*              gspca_dev->last_packet_type = DISCARD_PACKET; */
-                return;
+                break;
+        default:
+                data += 1;
+                len -= 1;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         }
-        data += 1;
-        len -= 1;
-        memcpy(&sd->tmpbuf[sd->buflen], data, len);
-        sd->buflen += len;
 }
 
 static void setbrightness(struct gspca_dev *gspca_dev)
@@ -804,12 +749,12 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x06e1, 0xa190), DVNM("ADS Instant VCD")},
-/*      {USB_DEVICE(0x0733, 0x0430), DVNM("UsbGrabber PV321c")}, */
-        {USB_DEVICE(0x0734, 0x043b), DVNM("3DeMon USB Capture aka")},
-        {USB_DEVICE(0x99fa, 0x8988), DVNM("Grandtec V.cap")},
+        {USB_DEVICE(0x06e1, 0xa190)},
+/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
+        {USB_DEVICE(0x0733, 0x0430)}, */
+        {USB_DEVICE(0x0734, 0x043b)},
+        {USB_DEVICE(0x99fa, 0x8988)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -834,7 +779,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index d8cd93866a4a..b608a27ad115 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -22,9 +22,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA508 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -33,10 +30,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        int buflen;
-        unsigned char tmpbuf[352 * 288 * 3 / 2]; /* YUVY per line */
-        unsigned char tmpbuf2[352 * 288 * 2];   /* YUYV */
-
         unsigned char brightness;
 
         char subtype;
@@ -71,23 +64,23 @@ static struct ctrl sd_ctrls[] = {
 
 static struct v4l2_pix_format sif_mode[] = {
         {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 160 * 2,
-                .sizeimage = 160 * 120 * 2,
+                .bytesperline = 160 * 3,
+                .sizeimage = 160 * 120 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 3},
         {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 176 * 2,
-                .sizeimage = 176 * 144 * 2,
+                .bytesperline = 176 * 3,
+                .sizeimage = 176 * 144 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 2},
         {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 320 * 2,
-                .sizeimage = 320 * 240 * 2,
+                .bytesperline = 320 * 3,
+                .sizeimage = 320 * 240 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
         {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 352 * 2,
-                .sizeimage = 352 * 288 * 2,
+                .bytesperline = 352 * 3,
+                .sizeimage = 352 * 288 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
@@ -1476,58 +1469,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 product;
         int data1, data2;
 
-        product = id->idProduct;
-        switch (id->idVendor) {
-        case 0x0130:            /* Clone webcam */
-/*              switch (product) { */
-/*              case 0x0130: */
-                        sd->subtype = HamaUSBSightcam;  /* same as Hama 0010 */
-/*                      break; */
-/*              } */
-                break;
-        case 0x041e:            /* Creative cameras */
-/*              switch (product) { */
-/*              case 0x4018: */
-                        sd->subtype = CreativeVista;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0461:            /* MicroInnovation */
-/*              switch (product) { */
-/*              case 0x0815: */
-                        sd->subtype = MicroInnovationIC200;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0733:    /* Rebadged ViewQuest (Intel) and ViewQuest cameras */
-/*              switch (product) { */
-/*              case 0x110: */
-                        sd->subtype = ViewQuestVQ110;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0af9:            /* Hama cameras */
-                switch (product) {
-                case 0x0010:
-                        sd->subtype = HamaUSBSightcam;
-                        break;
-                case 0x0011:
-                        sd->subtype = HamaUSBSightcam2;
-                        break;
-                }
-                break;
-        case 0x8086:            /* Intel */
-/*              switch (product) { */
-/*              case 0x0110: */
-                        sd->subtype = IntelEasyPCCamera;
-/*                      break; */
-/*              } */
-                break;
-        }
-
         /* Read from global register the USB product and vendor IDs, just to
          * prove that we can communicate with the device.  This works, which
          * confirms at we are communicating properly and that the device
@@ -1544,10 +1487,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
         PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
+
+        sd->subtype = id->driver_info;
         sd->brightness = BRIGHTNESS_DEF;
 
         switch (sd->subtype) {
@@ -1619,77 +1563,30 @@ static void sd_close(struct gspca_dev *gspca_dev)
 {
 }
 
-/* convert YUVY per line to YUYV (YUV 4:2:2) */
-static void yuvy_decode(unsigned char *out,
-                        unsigned char *in,
-                        int width,
-                        int height)
-{
-        unsigned char *Ui, *Vi, *yi, *yi1;
-        unsigned char *out1;
-        int i, j;
-
-        yi = in;
-        for (i = height / 2; --i >= 0; ) {
-                out1 = out + width * 2;         /* next line */
-                Ui = yi + width;
-                Vi = Ui + width / 2;
-                yi1 = Vi + width / 2;
-                for (j = width / 2; --j >= 0; ) {
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Ui;
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Vi;
-
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Ui++;
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Vi++;
-                }
-                yi += width * 2;
-                out = out1;
-        }
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
                         int len)                        /* iso packet length */
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         switch (data[0]) {
         case 0:                         /* start of frame */
-                if (gspca_dev->last_packet_type == FIRST_PACKET) {
-                        yuvy_decode(sd->tmpbuf2, sd->tmpbuf,
-                                        gspca_dev->width,
-                                        gspca_dev->height);
-                        frame = gspca_frame_add(gspca_dev,
-                                                LAST_PACKET,
-                                                frame,
-                                                sd->tmpbuf2,
-                                                gspca_dev->width
-                                                        * gspca_dev->height
-                                                        * 2);
-                }
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                data, 0);
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        data, 0);
                 data += SPCA508_OFFSET_DATA;
                 len -= SPCA508_OFFSET_DATA;
-                if (len > 0)
-                        memcpy(sd->tmpbuf, data, len);
-                else
-                        len = 0;
-                sd->buflen = len;
-                return;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         case 0xff:                      /* drop */
 /*              gspca_dev->last_packet_type = DISCARD_PACKET; */
-                return;
+                break;
+        default:
+                data += 1;
+                len -= 1;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         }
-        data += 1;
-        len -= 1;
-        memcpy(&sd->tmpbuf[sd->buflen], data, len);
-        sd->buflen += len;
 }
 
 static void setbrightness(struct gspca_dev *gspca_dev)
@@ -1745,15 +1642,14 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x0130, 0x0130), DVNM("Clone Digital Webcam 11043")},
-        {USB_DEVICE(0x041e, 0x4018), DVNM("Creative Webcam Vista (PD1100)")},
-        {USB_DEVICE(0x0461, 0x0815), DVNM("Micro Innovation IC200")},
-        {USB_DEVICE(0x0733, 0x0110), DVNM("ViewQuest VQ110")},
-        {USB_DEVICE(0x0af9, 0x0010), DVNM("Hama USB Sightcam 100")},
-        {USB_DEVICE(0x0af9, 0x0011), DVNM("Hama USB Sightcam 100")},
-        {USB_DEVICE(0x8086, 0x0110), DVNM("Intel Easy PC Camera")},
+        {USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
+        {USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
+        {USB_DEVICE(0x0461, 0x0815), .driver_info = MicroInnovationIC200},
+        {USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
+        {USB_DEVICE(0x0af9, 0x0010), .driver_info = HamaUSBSightcam},
+        {USB_DEVICE(0x0af9, 0x0011), .driver_info = HamaUSBSightcam2},
+        {USB_DEVICE(0x8086, 0x0110), .driver_info = IntelEasyPCCamera},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1778,7 +1674,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index b659bd0f788d..a26174508cb9 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA561 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -582,35 +579,15 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 PDEBUG(D_PROBE, "Bad vendor / product from device");
                 return -EINVAL;
         }
-        switch (product) {
-        case 0x0928:
-        case 0x0929:
-        case 0x092a:
-        case 0x092b:
-        case 0x092c:
-        case 0x092d:
-        case 0x092e:
-        case 0x092f:
-        case 0x403b:
-                sd->chip_revision = Rev012A;
-                break;
-        default:
-/*      case 0x0561:
-        case 0x0815:                    * ?? in spca508.c
-        case 0x401a:
-        case 0x7004:
-        case 0x7e50:
-        case 0xa001:
-        case 0xcdee: */
-                sd->chip_revision = Rev072A;
-                break;
-        }
+
         cam = &gspca_dev->cam;
         cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         gspca_dev->nbalt = 7 + 1;       /* choose alternate 7 first */
         cam->cam_mode = sif_mode;
         cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
+
+        sd->chip_revision = id->driver_info;
         sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
         sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
         sd->autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;
@@ -997,23 +974,22 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x401a), DVNM("Creative Webcam Vista (PD1100)")},
-        {USB_DEVICE(0x041e, 0x403b),  DVNM("Creative Webcam Vista (VF0010)")},
-        {USB_DEVICE(0x0458, 0x7004), DVNM("Genius VideoCAM Express V2")},
-        {USB_DEVICE(0x046d, 0x0928), DVNM("Logitech QC Express Etch2")},
-        {USB_DEVICE(0x046d, 0x0929), DVNM("Labtec Webcam Elch2")},
-        {USB_DEVICE(0x046d, 0x092a), DVNM("Logitech QC for Notebook")},
-        {USB_DEVICE(0x046d, 0x092b), DVNM("Labtec Webcam Plus")},
-        {USB_DEVICE(0x046d, 0x092c), DVNM("Logitech QC chat Elch2")},
-        {USB_DEVICE(0x046d, 0x092d), DVNM("Logitech QC Elch2")},
-        {USB_DEVICE(0x046d, 0x092e), DVNM("Logitech QC Elch2")},
-        {USB_DEVICE(0x046d, 0x092f), DVNM("Logitech QC Elch2")},
-        {USB_DEVICE(0x04fc, 0x0561), DVNM("Flexcam 100")},
-        {USB_DEVICE(0x060b, 0xa001), DVNM("Maxell Compact Pc PM3")},
-        {USB_DEVICE(0x10fd, 0x7e50), DVNM("FlyCam Usb 100")},
-        {USB_DEVICE(0xabcd, 0xcdee), DVNM("Petcam")},
+        {USB_DEVICE(0x041e, 0x401a), .driver_info = Rev072A},
+        {USB_DEVICE(0x041e, 0x403b), .driver_info = Rev012A},
+        {USB_DEVICE(0x0458, 0x7004), .driver_info = Rev072A},
+        {USB_DEVICE(0x046d, 0x0928), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x0929), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092a), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092b), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092c), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092d), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092e), .driver_info = Rev012A},
+        {USB_DEVICE(0x046d, 0x092f), .driver_info = Rev012A},
+        {USB_DEVICE(0x04fc, 0x0561), .driver_info = Rev072A},
+        {USB_DEVICE(0x060b, 0xa001), .driver_info = Rev072A},
+        {USB_DEVICE(0x10fd, 0x7e50), .driver_info = Rev072A},
+        {USB_DEVICE(0xabcd, 0xcdee), .driver_info = Rev072A},
         {}
 };
 
@@ -1039,7 +1015,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index c78ee0d3e59b..16219cf6a6d5 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -23,9 +23,6 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("Syntek DV4000 (STK014) USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -299,7 +296,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam = &gspca_dev->cam;
 
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x02;
         gspca_dev->cam.cam_mode = vga_mode;
         gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
@@ -549,9 +545,8 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x05e1, 0x0893), DVNM("Syntek DV4000")},
+        {USB_DEVICE(0x05e1, 0x0893)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -576,7 +571,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        info("v%s registered", version);
+        info("registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index abd7bef9b3d1..54efa48bee01 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -24,9 +24,6 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 8)
-static const char version[] = "2.1.8";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -804,229 +801,29 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
         struct cam *cam;
-        __u16 vendor;
-        __u16 product;
-        __u8 fw;
-
-        vendor = id->idVendor;
-        product = id->idProduct;
-        switch (vendor) {
-        case 0x041e:            /* Creative cameras */
-/*              switch (product) { */
-/*              case 0x400b: */
-/*              case 0x4012: */
-/*              case 0x4013: */
-/*                      sd->bridge = BRIDGE_SPCA504C; */
-/*                      break; */
-/*              } */
-                break;
-        case 0x0458:            /* Genius KYE cameras */
-/*              switch (product) { */
-/*              case 0x7006: */
-                        sd->bridge = BRIDGE_SPCA504B;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0461:            /* MicroInnovation */
-/*              switch (product) { */
-/*              case 0x0821: */
-                        sd->bridge = BRIDGE_SPCA533;
-/*                      break; */
-/*              } */
-                break;
-        case 0x046d:            /* Logitech Labtec */
-                switch (product) {
-                case 0x0905:
-                        sd->subtype = LogitechClickSmart820;
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x0960:
-                        sd->subtype = LogitechClickSmart420;
-                        sd->bridge = BRIDGE_SPCA504C;
-                        break;
-                }
-                break;
-        case 0x0471:                            /* Philips */
-/*              switch (product) { */
-/*              case 0x0322: */
-                        sd->bridge = BRIDGE_SPCA504B;
-/*                      break; */
-/*              } */
-                break;
-        case 0x04a5:            /* Benq */
-                switch (product) {
-                case 0x3003:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                case 0x3008:
-                case 0x300a:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                }
-                break;
-        case 0x04f1:            /* JVC */
-/*              switch (product) { */
-/*              case 0x1001: */
-                        sd->bridge = BRIDGE_SPCA504B;
-/*                      break; */
-/*              } */
-                break;
-        case 0x04fc:            /* SunPlus */
-                switch (product) {
-                case 0x500c:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                case 0x504a:
+
+        cam = &gspca_dev->cam;
+        cam->epaddr = 0x01;
+
+        sd->bridge = id->driver_info >> 8;
+        sd->subtype = id->driver_info;
+
+        if (sd->subtype == AiptekMiniPenCam13) {
 /* try to get the firmware as some cam answer 2.0.1.2.2
  * and should be a spca504b then overwrite that setting */
-                        reg_r(dev, 0x20, 0, gspca_dev->usb_buf, 1);
-                        fw = gspca_dev->usb_buf[0];
-                        if (fw == 1) {
-                                sd->subtype = AiptekMiniPenCam13;
-                                sd->bridge = BRIDGE_SPCA504;
-                        } else if (fw == 2) {
-                                sd->bridge = BRIDGE_SPCA504B;
-                        } else
-                                return -ENODEV;
-                        break;
-                case 0x504b:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                case 0x5330:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x5360:
-                        sd->bridge = BRIDGE_SPCA536;
-                        break;
-                case 0xffff:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                }
-                break;
-        case 0x052b:            /* ?? Megapix */
-/*              switch (product) { */
-/*              case 0x1513: */
-                        sd->subtype = MegapixV4;
-                        sd->bridge = BRIDGE_SPCA533;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0546:            /* Polaroid */
-                switch (product) {
-                case 0x3155:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x3191:
-                case 0x3273:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                }
-                break;
-        case 0x055f:            /* Mustek cameras */
-                switch (product) {
-                case 0xc211:
-                        sd->bridge = BRIDGE_SPCA536;
-                        break;
-                case 0xc230:
-                case 0xc232:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0xc360:
-                        sd->bridge = BRIDGE_SPCA536;
-                        break;
-                case 0xc420:
-                        sd->bridge = BRIDGE_SPCA504;
-                        break;
-                case 0xc430:
-                case 0xc440:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0xc520:
-                        sd->bridge = BRIDGE_SPCA504;
-                        break;
-                case 0xc530:
-                case 0xc540:
-                case 0xc630:
-                case 0xc650:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                }
-                break;
-        case 0x05da:            /* Digital Dream cameras */
-/*              switch (product) { */
-/*              case 0x1018: */
+                reg_r(dev, 0x20, 0, gspca_dev->usb_buf, 1);
+                switch (gspca_dev->usb_buf[0]) {
+                case 1:
+                        break;          /* (right bridge/subtype) */
+                case 2:
                         sd->bridge = BRIDGE_SPCA504B;
-/*                      break; */
-/*              } */
-                break;
-        case 0x06d6:            /* Trust */
-/*              switch (product) { */
-/*              case 0x0031: */
-                        sd->bridge = BRIDGE_SPCA533;    /* SPCA533A */
-/*                      break; */
-/*              } */
-                break;
-        case 0x0733:    /* Rebadged ViewQuest (Intel) and ViewQuest cameras */
-                switch (product) {
-                case 0x1311:
-                case 0x1314:
-                case 0x2211:
-                case 0x2221:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x3261:
-                case 0x3281:
-                        sd->bridge = BRIDGE_SPCA536;
-                        break;
-                }
-                break;
-        case 0x08ca:            /* Aiptek */
-                switch (product) {
-                case 0x0104:
-                case 0x0106:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x2008:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                case 0x2010:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x2016:
-                case 0x2018:
-                        sd->bridge = BRIDGE_SPCA504B;
-                        break;
-                case 0x2020:
-                case 0x2022:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x2024:
-                        sd->bridge = BRIDGE_SPCA536;
-                        break;
-                case 0x2028:
-                        sd->bridge = BRIDGE_SPCA533;
-                        break;
-                case 0x2040:
-                case 0x2042:
-                case 0x2050:
-                case 0x2060:
-                        sd->bridge = BRIDGE_SPCA536;
+                        sd->subtype = 0;
                         break;
+                default:
+                        return -ENODEV;
                 }
-                break;
-        case 0x0d64:            /* SunPlus */
-/*              switch (product) { */
-/*              case 0x0303: */
-                        sd->bridge = BRIDGE_SPCA536;
-/*                      break; */
-/*              } */
-                break;
         }
 
-        cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
-        cam->epaddr = 0x01;
-
         switch (sd->bridge) {
         default:
 /*      case BRIDGE_SPCA504B: */
@@ -1581,65 +1378,67 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
+#define BS(bridge, subtype) \
+        .driver_info = (BRIDGE_ ## bridge << 8) \
+                        | (subtype)
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x400b), DVNM("Creative PC-CAM 600")},
-        {USB_DEVICE(0x041e, 0x4012), DVNM("PC-Cam350")},
-        {USB_DEVICE(0x041e, 0x4013), DVNM("Creative Pccam750")},
-        {USB_DEVICE(0x0458, 0x7006), DVNM("Genius Dsc 1.3 Smart")},
-        {USB_DEVICE(0x0461, 0x0821), DVNM("Fujifilm MV-1")},
-        {USB_DEVICE(0x046d, 0x0905), DVNM("Logitech ClickSmart 820")},
-        {USB_DEVICE(0x046d, 0x0960), DVNM("Logitech ClickSmart 420")},
-        {USB_DEVICE(0x0471, 0x0322), DVNM("Philips DMVC1300K")},
-        {USB_DEVICE(0x04a5, 0x3003), DVNM("Benq DC 1300")},
-        {USB_DEVICE(0x04a5, 0x3008), DVNM("Benq DC 1500")},
-        {USB_DEVICE(0x04a5, 0x300a), DVNM("Benq DC3410")},
-        {USB_DEVICE(0x04f1, 0x1001), DVNM("JVC GC A50")},
-        {USB_DEVICE(0x04fc, 0x500c), DVNM("Sunplus CA500C")},
-        {USB_DEVICE(0x04fc, 0x504a), DVNM("Aiptek Mini PenCam 1.3")},
-        {USB_DEVICE(0x04fc, 0x504b), DVNM("Maxell MaxPocket LE 1.3")},
-        {USB_DEVICE(0x04fc, 0x5330), DVNM("Digitrex 2110")},
-        {USB_DEVICE(0x04fc, 0x5360), DVNM("Sunplus Generic")},
-        {USB_DEVICE(0x04fc, 0xffff), DVNM("Pure DigitalDakota")},
-        {USB_DEVICE(0x052b, 0x1513), DVNM("Megapix V4")},
-        {USB_DEVICE(0x0546, 0x3155), DVNM("Polaroid PDC3070")},
-        {USB_DEVICE(0x0546, 0x3191), DVNM("Polaroid Ion 80")},
-        {USB_DEVICE(0x0546, 0x3273), DVNM("Polaroid PDC2030")},
-        {USB_DEVICE(0x055f, 0xc211), DVNM("Kowa Bs888e Microcamera")},
-        {USB_DEVICE(0x055f, 0xc230), DVNM("Mustek Digicam 330K")},
-        {USB_DEVICE(0x055f, 0xc232), DVNM("Mustek MDC3500")},
-        {USB_DEVICE(0x055f, 0xc360), DVNM("Mustek DV4000 Mpeg4 ")},
-        {USB_DEVICE(0x055f, 0xc420), DVNM("Mustek gSmart Mini 2")},
-        {USB_DEVICE(0x055f, 0xc430), DVNM("Mustek Gsmart LCD 2")},
-        {USB_DEVICE(0x055f, 0xc440), DVNM("Mustek DV 3000")},
-        {USB_DEVICE(0x055f, 0xc520), DVNM("Mustek gSmart Mini 3")},
-        {USB_DEVICE(0x055f, 0xc530), DVNM("Mustek Gsmart LCD 3")},
-        {USB_DEVICE(0x055f, 0xc540), DVNM("Gsmart D30")},
-        {USB_DEVICE(0x055f, 0xc630), DVNM("Mustek MDC4000")},
-        {USB_DEVICE(0x055f, 0xc650), DVNM("Mustek MDC5500Z")},
-        {USB_DEVICE(0x05da, 0x1018), DVNM("Digital Dream Enigma 1.3")},
-        {USB_DEVICE(0x06d6, 0x0031), DVNM("Trust 610 LCD PowerC@m Zoom")},
-        {USB_DEVICE(0x0733, 0x1311), DVNM("Digital Dream Epsilon 1.3")},
-        {USB_DEVICE(0x0733, 0x1314), DVNM("Mercury 2.1MEG Deluxe Classic Cam")},
-        {USB_DEVICE(0x0733, 0x2211), DVNM("Jenoptik jdc 21 LCD")},
-        {USB_DEVICE(0x0733, 0x2221), DVNM("Mercury Digital Pro 3.1p")},
-        {USB_DEVICE(0x0733, 0x3261), DVNM("Concord 3045 spca536a")},
-        {USB_DEVICE(0x0733, 0x3281), DVNM("Cyberpix S550V")},
-        {USB_DEVICE(0x08ca, 0x0104), DVNM("Aiptek PocketDVII 1.3")},
-        {USB_DEVICE(0x08ca, 0x0106), DVNM("Aiptek Pocket DV3100+")},
-        {USB_DEVICE(0x08ca, 0x2008), DVNM("Aiptek Mini PenCam 2 M")},
-        {USB_DEVICE(0x08ca, 0x2010), DVNM("Aiptek PocketCam 3M")},
-        {USB_DEVICE(0x08ca, 0x2016), DVNM("Aiptek PocketCam 2 Mega")},
-        {USB_DEVICE(0x08ca, 0x2018), DVNM("Aiptek Pencam SD 2M")},
-        {USB_DEVICE(0x08ca, 0x2020), DVNM("Aiptek Slim 3000F")},
-        {USB_DEVICE(0x08ca, 0x2022), DVNM("Aiptek Slim 3200")},
-        {USB_DEVICE(0x08ca, 0x2024), DVNM("Aiptek DV3500 Mpeg4 ")},
-        {USB_DEVICE(0x08ca, 0x2028), DVNM("Aiptek PocketCam4M")},
-        {USB_DEVICE(0x08ca, 0x2040), DVNM("Aiptek PocketDV4100M")},
-        {USB_DEVICE(0x08ca, 0x2042), DVNM("Aiptek PocketDV5100")},
-        {USB_DEVICE(0x08ca, 0x2050), DVNM("Medion MD 41437")},
-        {USB_DEVICE(0x08ca, 0x2060), DVNM("Aiptek PocketDV5300")},
-        {USB_DEVICE(0x0d64, 0x0303), DVNM("Sunplus FashionCam DXG")},
+        {USB_DEVICE(0x041e, 0x400b), BS(SPCA504C, 0)},
+        {USB_DEVICE(0x041e, 0x4012), BS(SPCA504C, 0)},
+        {USB_DEVICE(0x041e, 0x4013), BS(SPCA504C, 0)},
+        {USB_DEVICE(0x0458, 0x7006), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x0461, 0x0821), BS(SPCA533, 0)},
+        {USB_DEVICE(0x046d, 0x0905), BS(SPCA533, LogitechClickSmart820)},
+        {USB_DEVICE(0x046d, 0x0960), BS(SPCA504C, LogitechClickSmart420)},
+        {USB_DEVICE(0x0471, 0x0322), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x04a5, 0x3003), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x04a5, 0x3008), BS(SPCA533, 0)},
+        {USB_DEVICE(0x04a5, 0x300a), BS(SPCA533, 0)},
+        {USB_DEVICE(0x04f1, 0x1001), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x04fc, 0x500c), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x04fc, 0x504a), BS(SPCA504, AiptekMiniPenCam13)},
+        {USB_DEVICE(0x04fc, 0x504b), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x04fc, 0x5330), BS(SPCA533, 0)},
+        {USB_DEVICE(0x04fc, 0x5360), BS(SPCA536, 0)},
+        {USB_DEVICE(0x04fc, 0xffff), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x052b, 0x1513), BS(SPCA533, MegapixV4)},
+        {USB_DEVICE(0x0546, 0x3155), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0546, 0x3191), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x0546, 0x3273), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x055f, 0xc211), BS(SPCA536, 0)},
+        {USB_DEVICE(0x055f, 0xc230), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc232), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc360), BS(SPCA536, 0)},
+        {USB_DEVICE(0x055f, 0xc420), BS(SPCA504, 0)},
+        {USB_DEVICE(0x055f, 0xc430), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc440), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc520), BS(SPCA504, 0)},
+        {USB_DEVICE(0x055f, 0xc530), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc540), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc630), BS(SPCA533, 0)},
+        {USB_DEVICE(0x055f, 0xc650), BS(SPCA533, 0)},
+        {USB_DEVICE(0x05da, 0x1018), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x06d6, 0x0031), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0733, 0x1311), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0733, 0x1314), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0733, 0x2211), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0733, 0x2221), BS(SPCA533, 0)},
+        {USB_DEVICE(0x0733, 0x3261), BS(SPCA536, 0)},
+        {USB_DEVICE(0x0733, 0x3281), BS(SPCA536, 0)},
+        {USB_DEVICE(0x08ca, 0x0104), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x0106), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x2008), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x08ca, 0x2010), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x2016), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x08ca, 0x2018), BS(SPCA504B, 0)},
+        {USB_DEVICE(0x08ca, 0x2020), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x2022), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x2024), BS(SPCA536, 0)},
+        {USB_DEVICE(0x08ca, 0x2028), BS(SPCA533, 0)},
+        {USB_DEVICE(0x08ca, 0x2040), BS(SPCA536, 0)},
+        {USB_DEVICE(0x08ca, 0x2042), BS(SPCA536, 0)},
+        {USB_DEVICE(0x08ca, 0x2050), BS(SPCA536, 0)},
+        {USB_DEVICE(0x08ca, 0x2060), BS(SPCA536, 0)},
+        {USB_DEVICE(0x0d64, 0x0303), BS(SPCA536, 0)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1664,7 +1463,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 00f47e463a05..91b555c34c68 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -1,12 +1,4 @@
 /*
- *Notes: * t613  + tas5130A
- *      * Focus to light do not balance well as in win.
- *        Quality in win is not good, but its kinda better.
- *       * Fix some "extraneous bytes", most of apps will show the image anyway
- *       * Gamma table, is there, but its really doing something?
- *       * 7~8 Fps, its ok, max on win its 10.
- *                      Costantino Leandro
- *
  * V4L2 by Jean-Francois Moine <http://moinejf.free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,16 +14,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *Notes: * t613  + tas5130A
+ *      * Focus to light do not balance well as in win.
+ *        Quality in win is not good, but its kinda better.
+ *       * Fix some "extraneous bytes", most of apps will show the image anyway
+ *       * Gamma table, is there, but its really doing something?
+ *       * 7~8 Fps, its ok, max on win its 10.
+ *                      Costantino Leandro
  */
 
 #define MODULE_NAME "t613"
+
 #include "gspca.h"
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
 
 #define MAX_GAMMA 0x10          /* 0 to 15 */
 
-/* From LUVCVIEW */
 #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
@@ -424,7 +422,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
 
         cam->cam_mode = vga_mode_t16;
@@ -998,9 +995,8 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x17a1, 0x0128), DVNM("XPX Webcam")},
+        {USB_DEVICE(0x17a1, 0x0128)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1025,7 +1021,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 0b793899095f..1ff8ba2f7fe5 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -22,9 +22,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("TV8532 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -249,7 +246,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         tv_8532WriteEEprom(gspca_dev);
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 1;
         cam->cam_mode = sif_mode;
         cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
@@ -624,13 +620,12 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x046d, 0x0920), DVNM("QC Express")},
-        {USB_DEVICE(0x046d, 0x0921), DVNM("Labtec Webcam")},
-        {USB_DEVICE(0x0545, 0x808b), DVNM("Veo Stingray")},
-        {USB_DEVICE(0x0545, 0x8333), DVNM("Veo Stingray")},
-        {USB_DEVICE(0x0923, 0x010f), DVNM("ICM532 cams")},
+        {USB_DEVICE(0x046d, 0x0920)},
+        {USB_DEVICE(0x046d, 0x0921)},
+        {USB_DEVICE(0x0545, 0x808b)},
+        {USB_DEVICE(0x0545, 0x8333)},
+        {USB_DEVICE(0x0923, 0x010f)},
         {}
 };
 
@@ -656,7 +651,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index fcf2c9e32573..a4221753e1bf 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/VC032X USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -1419,30 +1416,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct usb_device *dev = gspca_dev->dev;
         struct cam *cam;
         int sensor;
-        __u16 product;
-
-        product = id->idProduct;
-        sd->bridge = BRIDGE_VC0321;
-        switch (id->idVendor) {
-        case 0x0ac8:            /* Vimicro z-star */
-                switch (product) {
-                case 0x0323:
-                        sd->bridge = BRIDGE_VC0323;
-                        break;
-                }
-                break;
-        case 0x17ef:            /* Lenovo */
-/*              switch (product) { */
-/*              case 0x4802:     * Lenovo MI1310_SOC */
-                        sd->bridge = BRIDGE_VC0323;
-/*                      break; */
-/*              } */
-                break;
-        }
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x02;
+        sd->bridge = id->driver_info;
         if (sd->bridge == BRIDGE_VC0321) {
                 cam->cam_mode = vc0321_mode;
                 cam->nmodes = ARRAY_SIZE(vc0321_mode);
@@ -1771,16 +1748,15 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x046d, 0x0892), DVNM("Logitech Orbicam")},
-        {USB_DEVICE(0x046d, 0x0896), DVNM("Logitech Orbicam")},
-        {USB_DEVICE(0x0ac8, 0x0321), DVNM("Vimicro generic vc0321")},
-        {USB_DEVICE(0x0ac8, 0x0323), DVNM("Vimicro Vc0323")},
-        {USB_DEVICE(0x0ac8, 0x0328), DVNM("A4Tech PK-130MG")},
-        {USB_DEVICE(0x0ac8, 0xc001), DVNM("Sony embedded vimicro")},
-        {USB_DEVICE(0x0ac8, 0xc002), DVNM("Sony embedded vimicro")},
-        {USB_DEVICE(0x17ef, 0x4802), DVNM("Lenovo Vc0323+MI1310_SOC")},
+        {USB_DEVICE(0x046d, 0x0892), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x046d, 0x0896), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x0ac8, 0x0321), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x0ac8, 0x0323), .driver_info = BRIDGE_VC0323},
+        {USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1805,7 +1781,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index b761b11c5c6a..22a994ccb1d5 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>, "
                 "Serge A. Suchkov <Serge.A.S@tochka.ru>");
 MODULE_DESCRIPTION("GSPCA ZC03xx/VC3xx USB Camera Driver");
@@ -49,7 +46,7 @@ struct sd {
         __u8 sharpness;
 
         char qindex;
-        char sensor;                    /* Type of image sensor chip */
+        signed char sensor;             /* Type of image sensor chip */
 /* !! values used in different tables */
 #define SENSOR_CS2102 0
 #define SENSOR_CS2102K 1
@@ -2205,10 +2202,10 @@ static const struct usb_action hdcs2020xb_InitialScale[] = {
 };
 static const struct usb_action hdcs2020b_50HZ[] = {
         {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
-        {0xaa, 0x13, 0x0018}, /* 00,13,18,aa */
-        {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */
-        {0xaa, 0x0e, 0x0005}, /* 00,0e,05,aa */
-        {0xaa, 0x19, 0x001f}, /* 00,19,1f,aa */
+        {0xaa, 0x13, 0x0018},                   /* 00,13,18,aa */
+        {0xaa, 0x14, 0x0001},                   /* 00,14,01,aa */
+        {0xaa, 0x0e, 0x0005},                   /* 00,0e,05,aa */
+        {0xaa, 0x19, 0x001f},                   /* 00,19,1f,aa */
         {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
         {0xa0, 0x02, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,02,cc */
         {0xa0, 0x76, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,76,cc */
@@ -2226,10 +2223,10 @@ static const struct usb_action hdcs2020b_50HZ[] = {
 };
 static const struct usb_action hdcs2020b_60HZ[] = {
         {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
-        {0xaa, 0x13, 0x0031}, /* 00,13,31,aa */
-        {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */
-        {0xaa, 0x0e, 0x0004}, /* 00,0e,04,aa */
-        {0xaa, 0x19, 0x00cd}, /* 00,19,cd,aa */
+        {0xaa, 0x13, 0x0031},                   /* 00,13,31,aa */
+        {0xaa, 0x14, 0x0001},                   /* 00,14,01,aa */
+        {0xaa, 0x0e, 0x0004},                   /* 00,0e,04,aa */
+        {0xaa, 0x19, 0x00cd},                   /* 00,19,cd,aa */
         {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
         {0xa0, 0x02, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,02,cc */
         {0xa0, 0x62, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,62,cc */
@@ -2247,10 +2244,10 @@ static const struct usb_action hdcs2020b_60HZ[] = {
 };
 static const struct usb_action hdcs2020b_NoFliker[] = {
         {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
-        {0xaa, 0x13, 0x0010}, /* 00,13,10,aa */
-        {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */
-        {0xaa, 0x0e, 0x0004}, /* 00,0e,04,aa */
-        {0xaa, 0x19, 0x0000}, /* 00,19,00,aa */
+        {0xaa, 0x13, 0x0010},                   /* 00,13,10,aa */
+        {0xaa, 0x14, 0x0001},                   /* 00,14,01,aa */
+        {0xaa, 0x0e, 0x0004},                   /* 00,0e,04,aa */
+        {0xaa, 0x19, 0x0000},                   /* 00,19,00,aa */
         {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
         {0xa0, 0x02, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,02,cc */
         {0xa0, 0x70, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,70,cc */
@@ -4102,27 +4099,27 @@ static const struct usb_action pas106b_Initial_com[] = {
 
 static const struct usb_action pas106b_Initial[] = {    /* 176x144 */
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},          /* ClockSetting */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
 /* Sream and Sensor specific */
-        {0xa0, 0x0f, ZC3XX_R010_CMOSSENSORSELECT},      /* CMOSSensorSelect */
+        {0xa0, 0x0f, ZC3XX_R010_CMOSSENSORSELECT},
 /* Picture size */
-        {0xa0, 0x00, ZC3XX_R003_FRAMEWIDTHHIGH},  /* FrameWidthHigh 00 */
-        {0xa0, 0xb0, ZC3XX_R004_FRAMEWIDTHLOW},   /* FrameWidthLow B0 */
-        {0xa0, 0x00, ZC3XX_R005_FRAMEHEIGHTHIGH}, /* FrameHeightHigh 00 */
-        {0xa0, 0x90, ZC3XX_R006_FRAMEHEIGHTLOW},  /* FrameHightLow 90 */
+        {0xa0, 0x00, ZC3XX_R003_FRAMEWIDTHHIGH},
+        {0xa0, 0xb0, ZC3XX_R004_FRAMEWIDTHLOW},
+        {0xa0, 0x00, ZC3XX_R005_FRAMEHEIGHTHIGH},
+        {0xa0, 0x90, ZC3XX_R006_FRAMEHEIGHTLOW},
 /* System */
-        {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING}, /* SystemOperating */
+        {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
 /* Sream and Sensor specific */
-        {0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC}, /* VideoControlFunction */
-        {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, /* VideoControlFunction */
+        {0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC},
+        {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC},
 /* Sensor Interface */
-        {0xa0, 0x08, ZC3XX_R08D_COMPABILITYMODE},  /* Compatibily Mode */
+        {0xa0, 0x08, ZC3XX_R08D_COMPABILITYMODE},
 /* Window inside sensor array */
-        {0xa0, 0x03, ZC3XX_R09A_WINXSTARTLOW},  /* WinXStartLow */
-        {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},     /* FirstYLow */
-        {0xa0, 0x03, ZC3XX_R11C_FIRSTXLOW},     /* FirstxLow */
-        {0xa0, 0x28, ZC3XX_R09C_WINHEIGHTLOW},  /* WinHeightLow */
-        {0xa0, 0x68, ZC3XX_R09E_WINWIDTHLOW},   /* WinWidthLow */
+        {0xa0, 0x03, ZC3XX_R09A_WINXSTARTLOW},
+        {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
+        {0xa0, 0x03, ZC3XX_R11C_FIRSTXLOW},
+        {0xa0, 0x28, ZC3XX_R09C_WINHEIGHTLOW},
+        {0xa0, 0x68, ZC3XX_R09E_WINWIDTHLOW},
 /* Init the sensor */
         {0xaa, 0x02, 0x0004},
         {0xaa, 0x08, 0x0000},
@@ -4135,40 +4132,40 @@ static const struct usb_action pas106b_Initial[] = {	/* 176x144 */
         {0xaa, 0x14, 0x0081},
 
 /* Other registors */
-        {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, /* SensorCorrection */
+        {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
 /* Frame retreiving */
-        {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* AutoAdjustFPS */
+        {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
 /* Gains */
-        {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},   /* DigitalGain */
+        {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},
 /* Unknown */
         {0xa0, 0x00, 0x01ad},
 /* Sharpness */
-        {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, /* SharpnessMode */
-        {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},   /* Sharpness05 */
+        {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
+        {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
 /* Other registors */
-        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, /* OperationMode */
+        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
 /* Auto exposure and white balance */
-        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},     /* AWBStatus */
+        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
 /*Dead pixels */
-        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, /* DeadPixelsMode */
+        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
 /* EEPROM */
-        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},  /* EEPROMAccess */
+        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},  /* ClockSetting */
-        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},   /* sharpness+ */
-        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},   /* sharpness- */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
+        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},
 /* Other registers */
-        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, /* OperationMode */
+        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
 /* Auto exposure and white balance */
-        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},     /* AWBStatus */
+        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
 /*Dead pixels */
-        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, /* DeadPixelsMode */
+        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
 /* EEPROM */
-        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},  /* EEPROMAccess */
+        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},  /* ClockSetting */
-        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},   /* sharpness+ */
-        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},   /* sharpness- */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
+        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},
 
         {0xa0, 0x58, ZC3XX_R10A_RGB00}, /* matrix */
         {0xa0, 0xf4, ZC3XX_R10B_RGB01},
@@ -4180,67 +4177,67 @@ static const struct usb_action pas106b_Initial[] = {	/* 176x144 */
         {0xa0, 0xf4, ZC3XX_R111_RGB21},
         {0xa0, 0x58, ZC3XX_R112_RGB22},
 /* Auto correction */
-        {0xa0, 0x03, ZC3XX_R181_WINXSTART},     /* WinXstart */
-        {0xa0, 0x08, ZC3XX_R182_WINXWIDTH},     /* WinXWidth */
-        {0xa0, 0x16, ZC3XX_R183_WINXCENTER},    /* WinXCenter */
-        {0xa0, 0x03, ZC3XX_R184_WINYSTART},     /* WinYStart */
-        {0xa0, 0x05, ZC3XX_R185_WINYWIDTH},     /* WinYWidth */
-        {0xa0, 0x14, ZC3XX_R186_WINYCENTER},    /* WinYCenter */
-        {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, /* AutoCorrectEnable */
+        {0xa0, 0x03, ZC3XX_R181_WINXSTART},
+        {0xa0, 0x08, ZC3XX_R182_WINXWIDTH},
+        {0xa0, 0x16, ZC3XX_R183_WINXCENTER},
+        {0xa0, 0x03, ZC3XX_R184_WINYSTART},
+        {0xa0, 0x05, ZC3XX_R185_WINYWIDTH},
+        {0xa0, 0x14, ZC3XX_R186_WINYCENTER},
+        {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
 
 /* Auto exposure and white balance */
-        {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},     /* ExposureLimitHigh */
-        {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},      /* ExposureLimitMid */
-        {0xa0, 0xb1, ZC3XX_R192_EXPOSURELIMITLOW},      /* ExposureLimitLow */
-        {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},       /* AntiFlickerHigh */
-        {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},        /* AntiFlickerLow */
-        {0xa0, 0x87, ZC3XX_R197_ANTIFLICKERLOW},        /* AntiFlickerLow */
-        {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE},              /* AEBFreeze */
-        {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE},            /* AEBUnfreeze */
+        {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
+        {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},
+        {0xa0, 0xb1, ZC3XX_R192_EXPOSURELIMITLOW},
+        {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
+        {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
+        {0xa0, 0x87, ZC3XX_R197_ANTIFLICKERLOW},
+        {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE},
+        {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE},
 /* sensor on */
         {0xaa, 0x07, 0x00b1},
         {0xaa, 0x05, 0x0003},
         {0xaa, 0x04, 0x0001},
         {0xaa, 0x03, 0x003b},
 /* Gains */
-        {0xa0, 0x20, ZC3XX_R1A9_DIGITALLIMITDIFF},      /* DigitalLimitDiff */
-        {0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP},       /* DigitalGainStep */
-        {0xa0, 0xa0, ZC3XX_R11D_GLOBALGAIN},            /* GlobalGain */
-        {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},            /* GlobalGain */
+        {0xa0, 0x20, ZC3XX_R1A9_DIGITALLIMITDIFF},
+        {0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP},
+        {0xa0, 0xa0, ZC3XX_R11D_GLOBALGAIN},
+        {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
 /* Auto correction */
-        {0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},     /* AutoCorrectEnable */
+        {0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},
         {0xa1, 0x01, 0x0180},                           /* AutoCorrectEnable */
-        {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},     /* AutoCorrectEnable */
+        {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
 /* Gains */
-        {0xa0, 0x40, ZC3XX_R116_RGAIN},                 /* RGain */
-        {0xa0, 0x40, ZC3XX_R117_GGAIN},                 /* GGain */
-        {0xa0, 0x40, ZC3XX_R118_BGAIN},                 /* BGain */
+        {0xa0, 0x40, ZC3XX_R116_RGAIN},
+        {0xa0, 0x40, ZC3XX_R117_GGAIN},
+        {0xa0, 0x40, ZC3XX_R118_BGAIN},
         {}
 };
 
 static const struct usb_action pas106b_InitialScale[] = {       /* 352x288 */
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},          /* ClockSetting */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
 /* Sream and Sensor specific */
-        {0xa0, 0x0f, ZC3XX_R010_CMOSSENSORSELECT},      /* CMOSSensorSelect */
+        {0xa0, 0x0f, ZC3XX_R010_CMOSSENSORSELECT},
 /* Picture size */
-        {0xa0, 0x01, ZC3XX_R003_FRAMEWIDTHHIGH},        /* FrameWidthHigh */
-        {0xa0, 0x60, ZC3XX_R004_FRAMEWIDTHLOW},         /* FrameWidthLow */
-        {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},       /* FrameHeightHigh */
-        {0xa0, 0x20, ZC3XX_R006_FRAMEHEIGHTLOW},        /* FrameHightLow */
+        {0xa0, 0x01, ZC3XX_R003_FRAMEWIDTHHIGH},
+        {0xa0, 0x60, ZC3XX_R004_FRAMEWIDTHLOW},
+        {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
+        {0xa0, 0x20, ZC3XX_R006_FRAMEHEIGHTLOW},
 /* System */
-        {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},       /* SystemOperating */
+        {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
 /* Sream and Sensor specific */
-        {0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC}, /* VideoControlFunction */
-        {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, /* VideoControlFunction */
+        {0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC},
+        {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC},
 /* Sensor Interface */
-        {0xa0, 0x08, ZC3XX_R08D_COMPABILITYMODE},       /* Compatibily Mode */
+        {0xa0, 0x08, ZC3XX_R08D_COMPABILITYMODE},
 /* Window inside sensor array */
-        {0xa0, 0x03, ZC3XX_R09A_WINXSTARTLOW},  /* WinXStartLow */
-        {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},     /* FirstYLow */
-        {0xa0, 0x03, ZC3XX_R11C_FIRSTXLOW},     /* FirstxLow */
-        {0xa0, 0x28, ZC3XX_R09C_WINHEIGHTLOW},  /* WinHeightLow */
-        {0xa0, 0x68, ZC3XX_R09E_WINWIDTHLOW},   /* WinWidthLow */
+        {0xa0, 0x03, ZC3XX_R09A_WINXSTARTLOW},
+        {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
+        {0xa0, 0x03, ZC3XX_R11C_FIRSTXLOW},
+        {0xa0, 0x28, ZC3XX_R09C_WINHEIGHTLOW},
+        {0xa0, 0x68, ZC3XX_R09E_WINWIDTHLOW},
 /* Init the sensor */
         {0xaa, 0x02, 0x0004},
         {0xaa, 0x08, 0x0000},
@@ -4253,41 +4250,41 @@ static const struct usb_action pas106b_InitialScale[] = {	/* 352x288 */
         {0xaa, 0x14, 0x0081},
 
 /* Other registors */
-        {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, /* SensorCorrection */
+        {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
 /* Frame retreiving */
-        {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* AutoAdjustFPS */
+        {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
 /* Gains */
-        {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},   /* DigitalGain */
+        {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},
 /* Unknown */
         {0xa0, 0x00, 0x01ad},
 /* Sharpness */
-        {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, /* SharpnessMode */
-        {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},   /* Sharpness05 */
+        {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
+        {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
 /* Other registors */
-        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, /* OperationMode */
+        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
 /* Auto exposure and white balance */
-        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},     /* AWBStatus */
-        {0xa0, 0x80, ZC3XX_R18D_YTARGET},       /* ????????? */
+        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
+        {0xa0, 0x80, ZC3XX_R18D_YTARGET},
 /*Dead pixels */
-        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, /* DeadPixelsMode */
+        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
 /* EEPROM */
-        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},  /* EEPROMAccess */
+        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},  /* ClockSetting */
-        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},   /* sharpness+ */
-        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},   /* sharpness- */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
+        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},
 /* Other registers */
-        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, /* OperationMode */
+        {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
 /* Auto exposure and white balance */
-        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},     /* AWBStatus */
+        {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
 /*Dead pixels */
-        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, /* DeadPixelsMode */
+        {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
 /* EEPROM */
-        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},  /* EEPROMAccess */
+        {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
 /* JPEG control */
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},  /* ClockSetting */
-        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},   /* sharpness+ */
-        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},   /* sharpness- */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
+        {0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05},
 
         {0xa0, 0x58, ZC3XX_R10A_RGB00}, /* matrix */
         {0xa0, 0xf4, ZC3XX_R10B_RGB01},
@@ -4299,43 +4296,43 @@ static const struct usb_action pas106b_InitialScale[] = {	/* 352x288 */
         {0xa0, 0xf4, ZC3XX_R111_RGB21},
         {0xa0, 0x58, ZC3XX_R112_RGB22},
 /* Auto correction */
-        {0xa0, 0x03, ZC3XX_R181_WINXSTART},     /* WinXstart */
-        {0xa0, 0x08, ZC3XX_R182_WINXWIDTH},     /* WinXWidth */
-        {0xa0, 0x16, ZC3XX_R183_WINXCENTER},    /* WinXCenter */
-        {0xa0, 0x03, ZC3XX_R184_WINYSTART},     /* WinYStart */
-        {0xa0, 0x05, ZC3XX_R185_WINYWIDTH},     /* WinYWidth */
-        {0xa0, 0x14, ZC3XX_R186_WINYCENTER},    /* WinYCenter */
-        {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, /* AutoCorrectEnable */
+        {0xa0, 0x03, ZC3XX_R181_WINXSTART},
+        {0xa0, 0x08, ZC3XX_R182_WINXWIDTH},
+        {0xa0, 0x16, ZC3XX_R183_WINXCENTER},
+        {0xa0, 0x03, ZC3XX_R184_WINYSTART},
+        {0xa0, 0x05, ZC3XX_R185_WINYWIDTH},
+        {0xa0, 0x14, ZC3XX_R186_WINYCENTER},
+        {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
 
 /* Auto exposure and white balance */
-        {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* ExposureLimitHigh 0 */
-        {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},  /* ExposureLimitMid */
-        {0xa0, 0xb1, ZC3XX_R192_EXPOSURELIMITLOW},  /* ExposureLimitLow 0xb1 */
+        {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
+        {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},
+        {0xa0, 0xb1, ZC3XX_R192_EXPOSURELIMITLOW},
 
-        {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},   /* AntiFlickerHigh 0x00 */
-        {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},    /* AntiFlickerLow 0x00 */
-        {0xa0, 0x87, ZC3XX_R197_ANTIFLICKERLOW},    /* AntiFlickerLow 0x87 */
+        {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
+        {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
+        {0xa0, 0x87, ZC3XX_R197_ANTIFLICKERLOW},
 
-        {0xa0, 0x10, ZC3XX_R18C_AEFREEZE},      /* AEBFreeze 0x10 0x0c */
-        {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE},    /* AEBUnfreeze 0x30 0x18 */
+        {0xa0, 0x10, ZC3XX_R18C_AEFREEZE},
+        {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE},
 /* sensor on */
         {0xaa, 0x07, 0x00b1},
         {0xaa, 0x05, 0x0003},
         {0xaa, 0x04, 0x0001},
         {0xaa, 0x03, 0x003b},
 /* Gains */
-        {0xa0, 0x20, ZC3XX_R1A9_DIGITALLIMITDIFF},      /* DigitalLimitDiff */
-        {0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP},       /* DigitalGainStep */
-        {0xa0, 0xa0, ZC3XX_R11D_GLOBALGAIN},    /* GlobalGain */
-        {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},    /* GlobalGain */
+        {0xa0, 0x20, ZC3XX_R1A9_DIGITALLIMITDIFF},
+        {0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP},
+        {0xa0, 0xa0, ZC3XX_R11D_GLOBALGAIN},
+        {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
 /* Auto correction */
-        {0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},     /* AutoCorrectEnable */
+        {0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},
         {0xa1, 0x01, 0x0180},                           /* AutoCorrectEnable */
-        {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},     /* AutoCorrectEnable */
+        {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
 /* Gains */
-        {0xa0, 0x40, ZC3XX_R116_RGAIN},         /* RGain */
-        {0xa0, 0x40, ZC3XX_R117_GGAIN},         /* GGain */
-        {0xa0, 0x40, ZC3XX_R118_BGAIN},         /* BGain */
+        {0xa0, 0x40, ZC3XX_R116_RGAIN},
+        {0xa0, 0x40, ZC3XX_R117_GGAIN},
+        {0xa0, 0x40, ZC3XX_R118_BGAIN},
 
         {0xa0, 0x00, 0x0007},                   /* AutoCorrectEnable */
         {0xa0, 0xff, ZC3XX_R018_FRAMELOST},     /* Frame adjust */
@@ -4459,8 +4456,8 @@ static const struct usb_action pb03303x_Initial[] = {
         {0xa0, 0x50, ZC3XX_R112_RGB22},
 
         {0xa1, 0x01, 0x0008},
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},  /* clock ? */
-        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},   /* sharpness+ */
+        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
         {0xa1, 0x01, 0x01c8},
         {0xa1, 0x01, 0x01c9},
         {0xa1, 0x01, 0x01ca},
@@ -5984,7 +5981,7 @@ static const struct usb_action tas5130c_vf0250_Initial[] = {
         {0xaa, 0x1b, 0x0000},           /* 00,1b,00,aa, */
         {0xaa, 0x13, 0x0002},           /* 00,13,02,aa, */
         {0xaa, 0x15, 0x0004},           /* 00,15,04,aa */
-        {0xaa, 0x01, 0x0000},
+/*??    {0xaa, 0x01, 0x0000}, */
         {0xaa, 0x01, 0x0000},
         {0xaa, 0x1a, 0x0000},           /* 00,1a,00,aa, */
         {0xaa, 0x1c, 0x0017},           /* 00,1c,17,aa, */
@@ -6000,8 +5997,8 @@ static const struct usb_action tas5130c_vf0250_Initial[] = {
         {0xaa, 0x0f, 0x00a0},           /* 00,0f,a0,aa, */
         {0xaa, 0x10, 0x0000},           /* 00,10,00,aa, */
         {0xaa, 0x11, 0x00a0},           /* 00,11,a0,aa, */
-        {0xa0, 0x00, 0x0039},
-        {0xa1, 0x01, 0x0037},
+/*??    {0xa0, 0x00, 0x0039},
+        {0xa1, 0x01, 0x0037}, */
         {0xaa, 0x16, 0x0001},           /* 00,16,01,aa, */
         {0xaa, 0x17, 0x00e8},           /* 00,17,e6,aa, (e6 -> e8) */
         {0xaa, 0x18, 0x0002},           /* 00,18,02,aa, */
@@ -6272,7 +6269,7 @@ static void reg_w(struct usb_device *dev,
                         __u8 value,
                         __u16 index)
 {
-        PDEBUG(D_USBO, "reg w %02x -> [%04x]", value, index);
+        PDEBUG(D_USBO, "reg w [%04x] = %02x", index, value);
         reg_w_i(dev, value, index);
 }
 
@@ -6280,17 +6277,17 @@ static __u16 i2c_read(struct gspca_dev *gspca_dev,
                         __u8 reg)
 {
         __u8 retbyte;
-        __u8 retval[2];
+        __u16 retval;
 
         reg_w_i(gspca_dev->dev, reg, 0x92);
         reg_w_i(gspca_dev->dev, 0x02, 0x90);            /* <- read command */
         msleep(25);
         retbyte = reg_r_i(gspca_dev, 0x0091);           /* read status */
-        retval[0] = reg_r_i(gspca_dev, 0x0095);         /* read Lowbyte */
-        retval[1] = reg_r_i(gspca_dev, 0x0096);         /* read Hightbyte */
-        PDEBUG(D_USBO, "i2c r [%02x] -> (%02x) %02x%02x",
-                        reg, retbyte, retval[1], retval[0]);
-        return (retval[1] << 8) | retval[0];
+        retval = reg_r_i(gspca_dev, 0x0095);            /* read Lowbyte */
+        retval |= reg_r_i(gspca_dev, 0x0096) << 8;      /* read Hightbyte */
+        PDEBUG(D_USBO, "i2c r [%02x] -> %04x (%02x)",
+                        reg, retval, retbyte);
+        return retval;
 }
 
 static __u8 i2c_write(struct gspca_dev *gspca_dev,
@@ -6306,7 +6303,7 @@ static __u8 i2c_write(struct gspca_dev *gspca_dev,
         reg_w_i(gspca_dev->dev, 0x01, 0x90);            /* <- write command */
         msleep(5);
         retbyte = reg_r_i(gspca_dev, 0x0091);           /* read status */
-        PDEBUG(D_USBO, "i2c w [%02x] %02x%02x (%02x)",
+        PDEBUG(D_USBO, "i2c w [%02x] = %02x%02x (%02x)",
                         reg, valH, valL, retbyte);
         return retbyte;
 }
@@ -6349,6 +6346,8 @@ static void setmatrix(struct gspca_dev *gspca_dev)
                 {0x58, 0xf4, 0xf4, 0xf4, 0x58, 0xf4, 0xf4, 0xf4, 0x58};
         static const __u8 po2030_matrix[9] =
                 {0x60, 0xf0, 0xf0, 0xf0, 0x60, 0xf0, 0xf0, 0xf0, 0x60};
+        static const __u8 vf0250_matrix[9] =
+                {0x7b, 0xea, 0xea, 0xea, 0x7b, 0xea, 0xea, 0xea, 0x7b};
 
         switch (sd->sensor) {
         case SENSOR_GC0305:
@@ -6363,8 +6362,9 @@ static void setmatrix(struct gspca_dev *gspca_dev)
         case SENSOR_PO2030:
                 matrix = po2030_matrix;
                 break;
-        case SENSOR_TAS5130C_VF0250:    /* no matrix? */
-                return;
+        case SENSOR_TAS5130C_VF0250:
+                matrix = vf0250_matrix;
+                break;
         default:                /* matrix already loaded */
                 return;
         }
@@ -6744,7 +6744,7 @@ static int vga_2wr_probe(struct gspca_dev *gspca_dev)
                 return 0x04;                    /* CS2102 */
 
         start_2wr_probe(dev, 0x06);             /* OmniVision */
-        reg_w(dev, 0x08, 0x8d);
+        reg_w(dev, 0x08, 0x008d);
         i2c_write(gspca_dev, 0x11, 0xaa, 0x00);
         retbyte = i2c_read(gspca_dev, 0x11);
         if (retbyte != 0) {
@@ -6778,7 +6778,7 @@ static int vga_2wr_probe(struct gspca_dev *gspca_dev)
                 return 0x0c;                    /* ICM105A */
 
         start_2wr_probe(dev, 0x0e);             /* PAS202BCB */
-        reg_w(dev, 0x08, 0x8d);
+        reg_w(dev, 0x08, 0x008d);
         i2c_write(gspca_dev, 0x03, 0xaa, 0x00);
         msleep(500);
         retbyte = i2c_read(gspca_dev, 0x03);
@@ -6830,7 +6830,6 @@ static const struct sensor_by_chipset_revision chipset_revision_sensor[] = {
         {0x8001, 0x13},
         {0x8000, 0x14},         /* CS2102K */
         {0x8400, 0x15},         /* TAS5130K */
-        {0, 0}
 };
 
 static int vga_3wr_probe(struct gspca_dev *gspca_dev)
@@ -6843,7 +6842,7 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
 
 /*fixme: lack of 8b=b3 (11,12)-> 10, 8b=e0 (14,15,16)-> 12 found in gspcav1*/
         reg_w(dev, 0x02, 0x0010);
-        reg_r(gspca_dev, 0x10);
+        reg_r(gspca_dev, 0x0010);
         reg_w(dev, 0x01, 0x0000);
         reg_w(dev, 0x00, 0x0010);
         reg_w(dev, 0x01, 0x0001);
@@ -6869,17 +6868,15 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
         PDEBUG(D_PROBE, "probe 3wr vga 1 0x%04x", checkword);
         reg_r(gspca_dev, 0x0010);
         /* this is tested only once anyway */
-        i = 0;
-        while (chipset_revision_sensor[i].revision) {
+        for (i = 0; i < ARRAY_SIZE(chipset_revision_sensor); i++) {
                 if (chipset_revision_sensor[i].revision == checkword) {
                         sd->chip_revision = checkword;
                         send_unknown(dev, SENSOR_PB0330);
                         return chipset_revision_sensor[i].internal_sensor_id;
                 }
-                i++;
         }
 
-        reg_w(dev, 0x01, 0x0000);
+        reg_w(dev, 0x01, 0x0000);       /* check ?? */
         reg_w(dev, 0x01, 0x0001);
         reg_w(dev, 0xdd, 0x008b);
         reg_w(dev, 0x0a, 0x0010);
@@ -6901,8 +6898,11 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
         retbyte = i2c_read(gspca_dev, 0x00);
         if (retbyte != 0) {
                 PDEBUG(D_PROBE, "probe 3wr vga type %02x", retbyte);
-                send_unknown(dev, SENSOR_GC0305);
-                return retbyte;         /* 0x29 = gc0305 - should continue? */
+                if (retbyte == 0x11)                    /* VF0250 */
+                        return 0x0250;
+                if (retbyte == 0x29)                    /* gc0305 */
+                        send_unknown(dev, SENSOR_GC0305);
+                return retbyte;
         }
 
         reg_w(dev, 0x01, 0x0000);       /* check OmniVision */
@@ -6918,18 +6918,18 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
                 return 0x06;            /* OmniVision confirm ? */
         }
 
-        reg_w(dev, 0x01, 0x00);
-        reg_w(dev, 0x00, 0x02);
-        reg_w(dev, 0x01, 0x10);
-        reg_w(dev, 0x01, 0x01);
-        reg_w(dev, 0xee, 0x8b);
-        reg_w(dev, 0x03, 0x12);
+        reg_w(dev, 0x01, 0x0000);
+        reg_w(dev, 0x00, 0x0002);
+        reg_w(dev, 0x01, 0x0010);
+        reg_w(dev, 0x01, 0x0001);
+        reg_w(dev, 0xee, 0x008b);
+        reg_w(dev, 0x03, 0x0012);
 /*      msleep(150); */
-        reg_w(dev, 0x01, 0x12);
-        reg_w(dev, 0x05, 0x12);
-        retbyte = i2c_read(gspca_dev, 0x00);            /* ID 0 */
+        reg_w(dev, 0x01, 0x0012);
+        reg_w(dev, 0x05, 0x0012);
+        retbyte = i2c_read(gspca_dev, 0x0000);          /* ID 0 */
         checkword = retbyte << 8;
-        retbyte = i2c_read(gspca_dev, 0x01);            /* ID 1 */
+        retbyte = i2c_read(gspca_dev, 0x0001);          /* ID 1 */
         checkword |= retbyte;
         PDEBUG(D_PROBE, "probe 3wr vga 2 0x%04x", checkword);
         if (checkword == 0x2030) {
@@ -6939,14 +6939,14 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
                 return checkword;
         }
 
-        reg_w(dev, 0x01, 0x00);
-        reg_w(dev, 0x0a, 0x10);
-        reg_w(dev, 0xd3, 0x8b);
-        reg_w(dev, 0x01, 0x01);
-        reg_w(dev, 0x03, 0x12);
-        reg_w(dev, 0x01, 0x12);
-        reg_w(dev, 0x05, 0x01);
-        reg_w(dev, 0xd3, 0x8b);
+        reg_w(dev, 0x01, 0x0000);
+        reg_w(dev, 0x0a, 0x0010);
+        reg_w(dev, 0xd3, 0x008b);
+        reg_w(dev, 0x01, 0x0001);
+        reg_w(dev, 0x03, 0x0012);
+        reg_w(dev, 0x01, 0x0012);
+        reg_w(dev, 0x05, 0x0001);
+        reg_w(dev, 0xd3, 0x008b);
         retbyte = i2c_read(gspca_dev, 0x01);
         if (retbyte != 0) {
                 PDEBUG(D_PROBE, "probe 3wr vga type 0a ?");
@@ -6962,7 +6962,9 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case SENSOR_MC501CB:
+                return -1;              /* don't probe */
         case SENSOR_TAS5130C_VF0250:
+                                /* may probe but with write in reg 0x0010 */
                 return -1;              /* don't probe */
         }
         sensor = vga_2wr_probe(gspca_dev);
@@ -7010,30 +7012,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         /* define some sensors from the vendor/product */
         sd->sharpness = 2;
-        switch (id->idVendor) {
-        case 0x041e:                            /* Creative */
-                switch (id->idProduct) {
-                case 0x4051:                    /* zc301 chips */
-                case 0x4053:
-                        sd->sensor = SENSOR_TAS5130C_VF0250;
-                        break;
-                }
-                break;
-        case 0x046d:                            /* Logitech Labtec */
-                switch (id->idProduct) {
-                case 0x08dd:
-                        sd->sensor = SENSOR_MC501CB;
-                        break;
-                }
-                break;
-        case 0x0ac8:                            /* Vimicro z-star */
-                switch (id->idProduct) {
-                case 0x305b:
-                        sd->sensor = SENSOR_TAS5130C_VF0250;
-                        break;
-                }
-                break;
-        }
+        sd->sensor = id->driver_info;
         sensor = zcxx_probeSensor(gspca_dev);
         if (sensor >= 0)
                 PDEBUG(D_PROBE, "probe sensor -> %02x", sensor);
@@ -7119,6 +7098,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         PDEBUG(D_PROBE, "Find Sensor GC0305");
                         sd->sensor = SENSOR_GC0305;
                         break;
+                case 0x0250:
+                        PDEBUG(D_PROBE, "Sensor Tas5130 (VF0250)");
+                        sd->sensor =  SENSOR_TAS5130C_VF0250;
+                        break;
                 case 0x2030:
                         PDEBUG(D_PROBE, "Find Sensor PO2030");
                         sd->sensor = SENSOR_PO2030;
@@ -7146,7 +7129,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         }
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
 /*fixme:test*/
         gspca_dev->nbalt--;
@@ -7235,6 +7217,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         case SENSOR_GC0305:
         case SENSOR_OV7620:
         case SENSOR_PO2030:
+        case SENSOR_TAS5130C_VF0250:
                 msleep(100);                    /* ?? */
                 reg_r(gspca_dev, 0x0002);       /* --> 0x40 */
                 reg_w(dev, 0x09, 0x01ad);       /* (from win traces) */
@@ -7515,70 +7498,69 @@ static const struct sd_desc sd_desc = {
         .querymenu = sd_querymenu,
 };
 
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x041e, 0x041e), DVNM("Creative WebCam Live!")},
+        {USB_DEVICE(0x041e, 0x041e)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x041e, 0x4017), DVNM("Creative Webcam Mobile PD1090")},
-        {USB_DEVICE(0x041e, 0x401c), DVNM("Creative NX")},
-        {USB_DEVICE(0x041e, 0x401e), DVNM("Creative Nx Pro")},
-        {USB_DEVICE(0x041e, 0x401f), DVNM("Creative Webcam Notebook PD1171")},
+        {USB_DEVICE(0x041e, 0x4017)},
+        {USB_DEVICE(0x041e, 0x401c)},
+        {USB_DEVICE(0x041e, 0x401e)},
+        {USB_DEVICE(0x041e, 0x401f)},
 #endif
-        {USB_DEVICE(0x041e, 0x4029), DVNM("Creative WebCam Vista Pro")},
+        {USB_DEVICE(0x041e, 0x4029)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x041e, 0x4034), DVNM("Creative Instant P0620")},
-        {USB_DEVICE(0x041e, 0x4035), DVNM("Creative Instant P0620D")},
-        {USB_DEVICE(0x041e, 0x4036), DVNM("Creative Live !")},
-        {USB_DEVICE(0x041e, 0x403a), DVNM("Creative Nx Pro 2")},
+        {USB_DEVICE(0x041e, 0x4034)},
+        {USB_DEVICE(0x041e, 0x4035)},
+        {USB_DEVICE(0x041e, 0x4036)},
+        {USB_DEVICE(0x041e, 0x403a)},
 #endif
-        {USB_DEVICE(0x041e, 0x4051), DVNM("Creative Notebook Pro (VF0250)")},
-        {USB_DEVICE(0x041e, 0x4053), DVNM("Creative Live!Cam Video IM")},
+        {USB_DEVICE(0x041e, 0x4051), .driver_info = SENSOR_TAS5130C_VF0250},
+        {USB_DEVICE(0x041e, 0x4053), .driver_info = SENSOR_TAS5130C_VF0250},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x0458, 0x7007), DVNM("Genius VideoCam V2")},
-        {USB_DEVICE(0x0458, 0x700c), DVNM("Genius VideoCam V3")},
-        {USB_DEVICE(0x0458, 0x700f), DVNM("Genius VideoCam Web V2")},
+        {USB_DEVICE(0x0458, 0x7007)},
+        {USB_DEVICE(0x0458, 0x700c)},
+        {USB_DEVICE(0x0458, 0x700f)},
 #endif
-        {USB_DEVICE(0x0461, 0x0a00), DVNM("MicroInnovation WebCam320")},
-        {USB_DEVICE(0x046d, 0x08a0), DVNM("Logitech QC IM")},
-        {USB_DEVICE(0x046d, 0x08a1), DVNM("Logitech QC IM 0x08A1 +sound")},
-        {USB_DEVICE(0x046d, 0x08a2), DVNM("Labtec Webcam Pro")},
-        {USB_DEVICE(0x046d, 0x08a3), DVNM("Logitech QC Chat")},
-        {USB_DEVICE(0x046d, 0x08a6), DVNM("Logitech QCim")},
-        {USB_DEVICE(0x046d, 0x08a7), DVNM("Logitech QuickCam Image")},
-        {USB_DEVICE(0x046d, 0x08a9), DVNM("Logitech Notebook Deluxe")},
-        {USB_DEVICE(0x046d, 0x08aa), DVNM("Labtec Webcam Notebook")},
-        {USB_DEVICE(0x046d, 0x08ac), DVNM("Logitech QuickCam Cool")},
-        {USB_DEVICE(0x046d, 0x08ad), DVNM("Logitech QCCommunicate STX")},
+        {USB_DEVICE(0x0461, 0x0a00)},
+        {USB_DEVICE(0x046d, 0x08a0)},
+        {USB_DEVICE(0x046d, 0x08a1)},
+        {USB_DEVICE(0x046d, 0x08a2)},
+        {USB_DEVICE(0x046d, 0x08a3)},
+        {USB_DEVICE(0x046d, 0x08a6)},
+        {USB_DEVICE(0x046d, 0x08a7)},
+        {USB_DEVICE(0x046d, 0x08a9)},
+        {USB_DEVICE(0x046d, 0x08aa)},
+        {USB_DEVICE(0x046d, 0x08ac)},
+        {USB_DEVICE(0x046d, 0x08ad)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x046d, 0x08ae), DVNM("Logitech QuickCam for Notebooks")},
+        {USB_DEVICE(0x046d, 0x08ae)},
 #endif
-        {USB_DEVICE(0x046d, 0x08af), DVNM("Logitech QuickCam Cool")},
-        {USB_DEVICE(0x046d, 0x08b9), DVNM("Logitech QC IM ???")},
-        {USB_DEVICE(0x046d, 0x08d7), DVNM("Logitech QCam STX")},
-        {USB_DEVICE(0x046d, 0x08d9), DVNM("Logitech QuickCam IM/Connect")},
-        {USB_DEVICE(0x046d, 0x08d8), DVNM("Logitech Notebook Deluxe")},
-        {USB_DEVICE(0x046d, 0x08da), DVNM("Logitech QuickCam Messenger")},
-        {USB_DEVICE(0x046d, 0x08dd), DVNM("Logitech QuickCam for Notebooks")},
-        {USB_DEVICE(0x0471, 0x0325), DVNM("Philips SPC 200 NC")},
-        {USB_DEVICE(0x0471, 0x0326), DVNM("Philips SPC 300 NC")},
-        {USB_DEVICE(0x0471, 0x032d), DVNM("Philips spc210nc")},
-        {USB_DEVICE(0x0471, 0x032e), DVNM("Philips spc315nc")},
-        {USB_DEVICE(0x055f, 0xc005), DVNM("Mustek Wcam300A")},
+        {USB_DEVICE(0x046d, 0x08af)},
+        {USB_DEVICE(0x046d, 0x08b9)},
+        {USB_DEVICE(0x046d, 0x08d7)},
+        {USB_DEVICE(0x046d, 0x08d9)},
+        {USB_DEVICE(0x046d, 0x08d8)},
+        {USB_DEVICE(0x046d, 0x08da)},
+        {USB_DEVICE(0x046d, 0x08dd), .driver_info = SENSOR_MC501CB},
+        {USB_DEVICE(0x0471, 0x0325)},
+        {USB_DEVICE(0x0471, 0x0326)},
+        {USB_DEVICE(0x0471, 0x032d)},
+        {USB_DEVICE(0x0471, 0x032e)},
+        {USB_DEVICE(0x055f, 0xc005)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x055f, 0xd003), DVNM("Mustek WCam300A")},
-        {USB_DEVICE(0x055f, 0xd004), DVNM("Mustek WCam300 AN")},
+        {USB_DEVICE(0x055f, 0xd003)},
+        {USB_DEVICE(0x055f, 0xd004)},
 #endif
-        {USB_DEVICE(0x0698, 0x2003), DVNM("CTX M730V built in")},
-        {USB_DEVICE(0x0ac8, 0x0302), DVNM("Z-star Vimicro zc0302")},
+        {USB_DEVICE(0x0698, 0x2003)},
+        {USB_DEVICE(0x0ac8, 0x0302)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x0ac8, 0x301b), DVNM("Z-Star zc301b")},
-        {USB_DEVICE(0x0ac8, 0x303b), DVNM("Vimicro 0x303b")},
+        {USB_DEVICE(0x0ac8, 0x301b)},
+        {USB_DEVICE(0x0ac8, 0x303b)},
 #endif
-        {USB_DEVICE(0x0ac8, 0x305b), DVNM("Z-star Vimicro zc0305b")},
+        {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x0ac8, 0x307b), DVNM("Z-Star 307b")},
-        {USB_DEVICE(0x10fd, 0x0128), DVNM("Typhoon Webshot II 300k 0x0128")},
-        {USB_DEVICE(0x10fd, 0x8050), DVNM("Typhoon Webshot II USB 300k")},
+        {USB_DEVICE(0x0ac8, 0x307b)},
+        {USB_DEVICE(0x10fd, 0x0128)},
+        {USB_DEVICE(0x10fd, 0x8050)},
 #endif
         {}                      /* end of entry */
 };
@@ -7605,7 +7587,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 5d7ee8fcdd50..0069898bddab 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -2,9 +2,7 @@ config VIDEO_IVTV
         tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
         depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
         depends on INPUT   # due to VIDEO_IR
-        depends on HOTPLUG # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 41fd79279bb5..aea1664948ce 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -465,9 +465,8 @@ static void ivtv_process_eeprom(struct ivtv *itv)
         if (itv->options.radio == -1)
                 itv->options.radio = (tv.has_radio != 0);
         /* only enable newi2c if an IR blaster is present */
-        /* FIXME: for 2.6.20 the test against 2 should be removed */
-        if (itv->options.newi2c == -1 && tv.has_ir != -1 && tv.has_ir != 2) {
-                itv->options.newi2c = (tv.has_ir & 2) ? 1 : 0;
+        if (itv->options.newi2c == -1 && tv.has_ir) {
+                itv->options.newi2c = (tv.has_ir & 4) ? 1 : 0;
                 if (itv->options.newi2c) {
                     IVTV_INFO("Reopen i2c bus for IR-blaster support\n");
                     exit_ivtv_i2c(itv);
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index a08bb3331cfb..ab287b48fc2b 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -60,6 +60,7 @@
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
 #include <media/cx2341x.h>
 
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 52e00a7f3110..61030309d0ad 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1842,69 +1842,73 @@ int ivtv_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
         return res;
 }
 
-void ivtv_set_funcs(struct video_device *vdev)
-{
-        vdev->vidioc_querycap               = ivtv_querycap;
-        vdev->vidioc_g_priority             = ivtv_g_priority;
-        vdev->vidioc_s_priority             = ivtv_s_priority;
-        vdev->vidioc_s_audio                = ivtv_s_audio;
-        vdev->vidioc_g_audio                = ivtv_g_audio;
-        vdev->vidioc_enumaudio              = ivtv_enumaudio;
-        vdev->vidioc_s_audout               = ivtv_s_audout;
-        vdev->vidioc_g_audout               = ivtv_g_audout;
-        vdev->vidioc_enum_input             = ivtv_enum_input;
-        vdev->vidioc_enum_output            = ivtv_enum_output;
-        vdev->vidioc_enumaudout             = ivtv_enumaudout;
-        vdev->vidioc_cropcap                = ivtv_cropcap;
-        vdev->vidioc_s_crop                 = ivtv_s_crop;
-        vdev->vidioc_g_crop                 = ivtv_g_crop;
-        vdev->vidioc_g_input                = ivtv_g_input;
-        vdev->vidioc_s_input                = ivtv_s_input;
-        vdev->vidioc_g_output               = ivtv_g_output;
-        vdev->vidioc_s_output               = ivtv_s_output;
-        vdev->vidioc_g_frequency            = ivtv_g_frequency;
-        vdev->vidioc_s_frequency            = ivtv_s_frequency;
-        vdev->vidioc_s_tuner                = ivtv_s_tuner;
-        vdev->vidioc_g_tuner                = ivtv_g_tuner;
-        vdev->vidioc_g_enc_index            = ivtv_g_enc_index;
-        vdev->vidioc_g_fbuf                 = ivtv_g_fbuf;
-        vdev->vidioc_s_fbuf                 = ivtv_s_fbuf;
-        vdev->vidioc_g_std                  = ivtv_g_std;
-        vdev->vidioc_s_std                  = ivtv_s_std;
-        vdev->vidioc_overlay                = ivtv_overlay;
-        vdev->vidioc_log_status             = ivtv_log_status;
-        vdev->vidioc_enum_fmt_vid_cap       = ivtv_enum_fmt_vid_cap;
-        vdev->vidioc_encoder_cmd            = ivtv_encoder_cmd;
-        vdev->vidioc_try_encoder_cmd        = ivtv_try_encoder_cmd;
-        vdev->vidioc_enum_fmt_vid_out       = ivtv_enum_fmt_vid_out;
-        vdev->vidioc_g_fmt_vid_cap          = ivtv_g_fmt_vid_cap;
-        vdev->vidioc_g_fmt_vbi_cap          = ivtv_g_fmt_vbi_cap;
-        vdev->vidioc_g_fmt_sliced_vbi_cap   = ivtv_g_fmt_sliced_vbi_cap;
-        vdev->vidioc_g_fmt_vid_out          = ivtv_g_fmt_vid_out;
-        vdev->vidioc_g_fmt_vid_out_overlay  = ivtv_g_fmt_vid_out_overlay;
-        vdev->vidioc_g_fmt_sliced_vbi_out   = ivtv_g_fmt_sliced_vbi_out;
-        vdev->vidioc_s_fmt_vid_cap          = ivtv_s_fmt_vid_cap;
-        vdev->vidioc_s_fmt_vbi_cap          = ivtv_s_fmt_vbi_cap;
-        vdev->vidioc_s_fmt_sliced_vbi_cap   = ivtv_s_fmt_sliced_vbi_cap;
-        vdev->vidioc_s_fmt_vid_out          = ivtv_s_fmt_vid_out;
-        vdev->vidioc_s_fmt_vid_out_overlay  = ivtv_s_fmt_vid_out_overlay;
-        vdev->vidioc_s_fmt_sliced_vbi_out   = ivtv_s_fmt_sliced_vbi_out;
-        vdev->vidioc_try_fmt_vid_cap        = ivtv_try_fmt_vid_cap;
-        vdev->vidioc_try_fmt_vbi_cap        = ivtv_try_fmt_vbi_cap;
-        vdev->vidioc_try_fmt_sliced_vbi_cap = ivtv_try_fmt_sliced_vbi_cap;
-        vdev->vidioc_try_fmt_vid_out        = ivtv_try_fmt_vid_out;
-        vdev->vidioc_try_fmt_vid_out_overlay = ivtv_try_fmt_vid_out_overlay;
-        vdev->vidioc_try_fmt_sliced_vbi_out = ivtv_try_fmt_sliced_vbi_out;
-        vdev->vidioc_g_sliced_vbi_cap       = ivtv_g_sliced_vbi_cap;
-        vdev->vidioc_g_chip_ident           = ivtv_g_chip_ident;
+static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {
+        .vidioc_querycap                    = ivtv_querycap,
+        .vidioc_g_priority                  = ivtv_g_priority,
+        .vidioc_s_priority                  = ivtv_s_priority,
+        .vidioc_s_audio                     = ivtv_s_audio,
+        .vidioc_g_audio                     = ivtv_g_audio,
+        .vidioc_enumaudio                   = ivtv_enumaudio,
+        .vidioc_s_audout                    = ivtv_s_audout,
+        .vidioc_g_audout                    = ivtv_g_audout,
+        .vidioc_enum_input                  = ivtv_enum_input,
+        .vidioc_enum_output                 = ivtv_enum_output,
+        .vidioc_enumaudout                  = ivtv_enumaudout,
+        .vidioc_cropcap                     = ivtv_cropcap,
+        .vidioc_s_crop                      = ivtv_s_crop,
+        .vidioc_g_crop                      = ivtv_g_crop,
+        .vidioc_g_input                     = ivtv_g_input,
+        .vidioc_s_input                     = ivtv_s_input,
+        .vidioc_g_output                    = ivtv_g_output,
+        .vidioc_s_output                    = ivtv_s_output,
+        .vidioc_g_frequency                 = ivtv_g_frequency,
+        .vidioc_s_frequency                 = ivtv_s_frequency,
+        .vidioc_s_tuner                     = ivtv_s_tuner,
+        .vidioc_g_tuner                     = ivtv_g_tuner,
+        .vidioc_g_enc_index                 = ivtv_g_enc_index,
+        .vidioc_g_fbuf                      = ivtv_g_fbuf,
+        .vidioc_s_fbuf                      = ivtv_s_fbuf,
+        .vidioc_g_std                       = ivtv_g_std,
+        .vidioc_s_std                       = ivtv_s_std,
+        .vidioc_overlay                     = ivtv_overlay,
+        .vidioc_log_status                  = ivtv_log_status,
+        .vidioc_enum_fmt_vid_cap            = ivtv_enum_fmt_vid_cap,
+        .vidioc_encoder_cmd                 = ivtv_encoder_cmd,
+        .vidioc_try_encoder_cmd             = ivtv_try_encoder_cmd,
+        .vidioc_enum_fmt_vid_out            = ivtv_enum_fmt_vid_out,
+        .vidioc_g_fmt_vid_cap               = ivtv_g_fmt_vid_cap,
+        .vidioc_g_fmt_vbi_cap               = ivtv_g_fmt_vbi_cap,
+        .vidioc_g_fmt_sliced_vbi_cap        = ivtv_g_fmt_sliced_vbi_cap,
+        .vidioc_g_fmt_vid_out               = ivtv_g_fmt_vid_out,
+        .vidioc_g_fmt_vid_out_overlay       = ivtv_g_fmt_vid_out_overlay,
+        .vidioc_g_fmt_sliced_vbi_out        = ivtv_g_fmt_sliced_vbi_out,
+        .vidioc_s_fmt_vid_cap               = ivtv_s_fmt_vid_cap,
+        .vidioc_s_fmt_vbi_cap               = ivtv_s_fmt_vbi_cap,
+        .vidioc_s_fmt_sliced_vbi_cap        = ivtv_s_fmt_sliced_vbi_cap,
+        .vidioc_s_fmt_vid_out               = ivtv_s_fmt_vid_out,
+        .vidioc_s_fmt_vid_out_overlay       = ivtv_s_fmt_vid_out_overlay,
+        .vidioc_s_fmt_sliced_vbi_out        = ivtv_s_fmt_sliced_vbi_out,
+        .vidioc_try_fmt_vid_cap             = ivtv_try_fmt_vid_cap,
+        .vidioc_try_fmt_vbi_cap             = ivtv_try_fmt_vbi_cap,
+        .vidioc_try_fmt_sliced_vbi_cap      = ivtv_try_fmt_sliced_vbi_cap,
+        .vidioc_try_fmt_vid_out             = ivtv_try_fmt_vid_out,
+        .vidioc_try_fmt_vid_out_overlay     = ivtv_try_fmt_vid_out_overlay,
+        .vidioc_try_fmt_sliced_vbi_out      = ivtv_try_fmt_sliced_vbi_out,
+        .vidioc_g_sliced_vbi_cap            = ivtv_g_sliced_vbi_cap,
+        .vidioc_g_chip_ident                = ivtv_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        vdev->vidioc_g_register             = ivtv_g_register;
-        vdev->vidioc_s_register             = ivtv_s_register;
+        .vidioc_g_register                  = ivtv_g_register,
+        .vidioc_s_register                  = ivtv_s_register,
 #endif
-        vdev->vidioc_default                = ivtv_default;
-        vdev->vidioc_queryctrl              = ivtv_queryctrl;
-        vdev->vidioc_querymenu              = ivtv_querymenu;
-        vdev->vidioc_g_ext_ctrls            = ivtv_g_ext_ctrls;
-        vdev->vidioc_s_ext_ctrls            = ivtv_s_ext_ctrls;
-        vdev->vidioc_try_ext_ctrls          = ivtv_try_ext_ctrls;
+        .vidioc_default                     = ivtv_default,
+        .vidioc_queryctrl                   = ivtv_queryctrl,
+        .vidioc_querymenu                   = ivtv_querymenu,
+        .vidioc_g_ext_ctrls                 = ivtv_g_ext_ctrls,
+        .vidioc_s_ext_ctrls                 = ivtv_s_ext_ctrls,
+        .vidioc_try_ext_ctrls               = ivtv_try_ext_ctrls,
+};
+
+void ivtv_set_funcs(struct video_device *vdev)
+{
+        vdev->ioctl_ops = &ivtv_ioctl_ops;
 }
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index f8883b487f4a..54d2023b26c4 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -208,16 +208,11 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
                 return -ENOMEM;
         }
 
-        s->v4l2dev->type = VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT |
-                    VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER;
-        if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
-                s->v4l2dev->type |= VID_TYPE_MPEG_DECODER;
-        }
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
                         itv->num, s->name);
 
         s->v4l2dev->minor = minor;
-        s->v4l2dev->dev = &itv->dev->dev;
+        s->v4l2dev->parent = &itv->dev->dev;
         s->v4l2dev->fops = ivtv_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
         s->v4l2dev->tvnorms = V4L2_STD_ALL;
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 39bf6b114d50..89a781c6929d 100644
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -26,7 +26,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/m52790.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 2fb5854cf6f0..7c8ef6ac6c39 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -1697,13 +1698,7 @@ static const struct file_operations meye_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device meye_template = {
-        .owner          = THIS_MODULE,
-        .name           = "meye",
-        .type           = VID_TYPE_CAPTURE,
-        .fops           = &meye_fops,
-        .release        = video_device_release,
-        .minor          = -1,
+static const struct v4l2_ioctl_ops meye_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
         .vidioc_enum_input      = vidioc_enum_input,
         .vidioc_g_input         = vidioc_g_input,
@@ -1724,6 +1719,14 @@ static struct video_device meye_template = {
         .vidioc_default         = vidioc_default,
 };
 
+static struct video_device meye_template = {
+        .name           = "meye",
+        .fops           = &meye_fops,
+        .ioctl_ops      = &meye_ioctl_ops,
+        .release        = video_device_release,
+        .minor          = -1,
+};
+
 #ifdef CONFIG_PM
 static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -1801,7 +1804,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
         }
 
         memcpy(meye.video_dev, &meye_template, sizeof(meye_template));
-        meye.video_dev->dev = &meye.mchip_dev->dev;
+        meye.video_dev->parent = &meye.mchip_dev->dev;
 
         if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {
                 printk(KERN_ERR "meye: unable to power on the camera\n");
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 5691e019d195..3da74dcee902 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -51,9 +51,9 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/v4l2-i2c-drv-legacy.h>
 #include <media/tvaudio.h>
 #include <media/msp3400.h>
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 1622f70e4dd0..846a14a61fd1 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/freezer.h>
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/msp3400.h>
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index ee43499544c1..554d2295484e 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -120,7 +120,7 @@ static int mt9m001_init(struct soc_camera_device *icd)
         int ret;
 
         /* Disable chip, synchronous option update */
-        dev_dbg(icd->vdev->dev, "%s\n", __func__);
+        dev_dbg(icd->vdev->parent, "%s\n", __func__);
 
         ret = reg_write(icd, MT9M001_RESET, 1);
         if (ret >= 0)
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index eafb0c7736e6..9edaca4371d7 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4666,9 +4666,7 @@ static const struct file_operations ov511_fops = {
 };
 
 static struct video_device vdev_template = {
-        .owner =        THIS_MODULE,
         .name =         "OV511 USB Camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &ov511_fops,
         .release =      video_device_release,
         .minor =        -1,
@@ -5661,43 +5659,43 @@ static int ov_create_sysfs(struct video_device *vdev)
 {
         int rc;
 
-        rc = video_device_create_file(vdev, &dev_attr_custom_id);
+        rc = device_create_file(&vdev->dev, &dev_attr_custom_id);
         if (rc) goto err;
-        rc = video_device_create_file(vdev, &dev_attr_model);
+        rc = device_create_file(&vdev->dev, &dev_attr_model);
         if (rc) goto err_id;
-        rc = video_device_create_file(vdev, &dev_attr_bridge);
+        rc = device_create_file(&vdev->dev, &dev_attr_bridge);
         if (rc) goto err_model;
-        rc = video_device_create_file(vdev, &dev_attr_sensor);
+        rc = device_create_file(&vdev->dev, &dev_attr_sensor);
         if (rc) goto err_bridge;
-        rc = video_device_create_file(vdev, &dev_attr_brightness);
+        rc = device_create_file(&vdev->dev, &dev_attr_brightness);
         if (rc) goto err_sensor;
-        rc = video_device_create_file(vdev, &dev_attr_saturation);
+        rc = device_create_file(&vdev->dev, &dev_attr_saturation);
         if (rc) goto err_bright;
-        rc = video_device_create_file(vdev, &dev_attr_contrast);
+        rc = device_create_file(&vdev->dev, &dev_attr_contrast);
         if (rc) goto err_sat;
-        rc = video_device_create_file(vdev, &dev_attr_hue);
+        rc = device_create_file(&vdev->dev, &dev_attr_hue);
         if (rc) goto err_contrast;
-        rc = video_device_create_file(vdev, &dev_attr_exposure);
+        rc = device_create_file(&vdev->dev, &dev_attr_exposure);
         if (rc) goto err_hue;
 
         return 0;
 
 err_hue:
-        video_device_remove_file(vdev, &dev_attr_hue);
+        device_remove_file(&vdev->dev, &dev_attr_hue);
 err_contrast:
-        video_device_remove_file(vdev, &dev_attr_contrast);
+        device_remove_file(&vdev->dev, &dev_attr_contrast);
 err_sat:
-        video_device_remove_file(vdev, &dev_attr_saturation);
+        device_remove_file(&vdev->dev, &dev_attr_saturation);
 err_bright:
-        video_device_remove_file(vdev, &dev_attr_brightness);
+        device_remove_file(&vdev->dev, &dev_attr_brightness);
 err_sensor:
-        video_device_remove_file(vdev, &dev_attr_sensor);
+        device_remove_file(&vdev->dev, &dev_attr_sensor);
 err_bridge:
-        video_device_remove_file(vdev, &dev_attr_bridge);
+        device_remove_file(&vdev->dev, &dev_attr_bridge);
 err_model:
-        video_device_remove_file(vdev, &dev_attr_model);
+        device_remove_file(&vdev->dev, &dev_attr_model);
 err_id:
-        video_device_remove_file(vdev, &dev_attr_custom_id);
+        device_remove_file(&vdev->dev, &dev_attr_custom_id);
 err:
         return rc;
 }
@@ -5833,7 +5831,7 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
 
         memcpy(ov->vdev, &vdev_template, sizeof(*ov->vdev));
-        ov->vdev->dev = &intf->dev;
+        ov->vdev->parent = &intf->dev;
         video_set_drvdata(ov->vdev, ov);
 
         for (i = 0; i < OV511_MAX_UNIT_VIDEO; i++) {
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 1010e51189b7..baded1262ca9 100644
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -4,6 +4,7 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 36047d4e70f6..e69de29bb2d1 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -1,2309 +0,0 @@
-/*
-    planb - PlanB frame grabber driver
-
-    PlanB is used in the 7x00/8x00 series of PowerMacintosh
-    Computers as video input DMA controller.
-
-    Copyright (C) 1998 Michel Lanners (mlan@cpu.lu)
-
-    Based largely on the bttv driver by Ralph Metzler (rjkm@thp.uni-koeln.de)
-
-    Additional debugging and coding by Takashi Oe (toe@unlserve.unl.edu)
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* $Id: planb.c,v 1.18 1999/05/02 17:36:34 mlan Exp $ */
-
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/vmalloc.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-#include <linux/wait.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/dbdma.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/irq.h>
-#include <linux/mutex.h>
-
-#include "planb.h"
-#include "saa7196.h"
-
-/* Would you mind for some ugly debugging? */
-#if 0
-#define DEBUG(x...) printk(KERN_DEBUG ## x) /* Debug driver */
-#else
-#define DEBUG(x...)             /* Don't debug driver */
-#endif
-
-#if 0
-#define IDEBUG(x...) printk(KERN_DEBUG ## x) /* Debug interrupt part */
-#else
-#define IDEBUG(x...)            /* Don't debug interrupt part */
-#endif
-
-/* Ever seen a Mac with more than 1 of these? */
-#define PLANB_MAX 1
-
-static int planb_num;
-static struct planb planbs[PLANB_MAX];
-static volatile struct planb_registers *planb_regs;
-
-static int def_norm = PLANB_DEF_NORM;   /* default norm */
-static int video_nr = -1;
-
-module_param(def_norm, int, 0);
-MODULE_PARM_DESC(def_norm, "Default startup norm (0=PAL, 1=NTSC, 2=SECAM)");
-module_param(video_nr, int, 0);
-MODULE_LICENSE("GPL");
-
-
-/* ------------------ PlanB Exported Functions ------------------ */
-static long planb_write(struct video_device *, const char *, unsigned long, int);
-static long planb_read(struct video_device *, char *, unsigned long, int);
-static int planb_open(struct video_device *, int);
-static void planb_close(struct video_device *);
-static int planb_ioctl(struct video_device *, unsigned int, void *);
-static int planb_init_done(struct video_device *);
-static int planb_mmap(struct video_device *, const char *, unsigned long);
-static void release_planb(void);
-int init_planbs(struct video_init *);
-
-/* ------------------ PlanB Internal Functions ------------------ */
-static int planb_prepare_open(struct planb *);
-static void planb_prepare_close(struct planb *);
-static void saa_write_reg(unsigned char, unsigned char);
-static unsigned char saa_status(int, struct planb *);
-static void saa_set(unsigned char, unsigned char, struct planb *);
-static void saa_init_regs(struct planb *);
-static int grabbuf_alloc(struct planb *);
-static int vgrab(struct planb *, struct video_mmap *);
-static void add_clip(struct planb *, struct video_clip *);
-static void fill_cmd_buff(struct planb *);
-static void cmd_buff(struct planb *);
-static volatile struct dbdma_cmd *setup_grab_cmd(int, struct planb *);
-static void overlay_start(struct planb *);
-static void overlay_stop(struct planb *);
-static inline void tab_cmd_dbdma(volatile struct dbdma_cmd *, unsigned short,
-        unsigned int);
-static inline void tab_cmd_store(volatile struct dbdma_cmd *, unsigned int,
-        unsigned int);
-static inline void tab_cmd_gen(volatile struct dbdma_cmd *, unsigned short,
-        unsigned short, unsigned int, unsigned int);
-static int init_planb(struct planb *);
-static int find_planb(void);
-static void planb_pre_capture(int, int, struct planb *);
-static volatile struct dbdma_cmd *cmd_geo_setup(volatile struct dbdma_cmd *,
-                                        int, int, int, int, int, struct planb *);
-static inline void planb_dbdma_stop(volatile struct dbdma_regs *);
-static unsigned int saa_geo_setup(int, int, int, int, struct planb *);
-static inline int overlay_is_active(struct planb *);
-
-/*******************************/
-/* Memory management functions */
-/*******************************/
-
-static int grabbuf_alloc(struct planb *pb)
-{
-        int i, npage;
-
-        npage = MAX_GBUFFERS * ((PLANB_MAX_FBUF / PAGE_SIZE + 1)
-#ifndef PLANB_GSCANLINE
-                + MAX_LNUM
-#endif /* PLANB_GSCANLINE */
-                );
-        if ((pb->rawbuf = kmalloc(npage
-                                * sizeof(unsigned long), GFP_KERNEL)) == 0)
-                return -ENOMEM;
-        for (i = 0; i < npage; i++) {
-                pb->rawbuf[i] = (unsigned char *)__get_free_pages(GFP_KERNEL
-                                                                |GFP_DMA, 0);
-                if (!pb->rawbuf[i])
-                        break;
-                SetPageReserved(virt_to_page(pb->rawbuf[i]));
-        }
-        if (i-- < npage) {
-                printk(KERN_DEBUG "PlanB: init_grab: grab buffer not allocated\n");
-                for (; i > 0; i--) {
-                        ClearPageReserved(virt_to_page(pb->rawbuf[i]));
-                        free_pages((unsigned long)pb->rawbuf[i], 0);
-                }
-                kfree(pb->rawbuf);
-                return -ENOBUFS;
-        }
-        pb->rawbuf_size = npage;
-        return 0;
-}
-
-/*****************************/
-/* Hardware access functions */
-/*****************************/
-
-static void saa_write_reg(unsigned char addr, unsigned char val)
-{
-        planb_regs->saa_addr = addr; eieio();
-        planb_regs->saa_regval = val; eieio();
-        return;
-}
-
-/* return  status byte 0 or 1: */
-static unsigned char saa_status(int byte, struct planb *pb)
-{
-        saa_regs[pb->win.norm][SAA7196_STDC] =
-                (saa_regs[pb->win.norm][SAA7196_STDC] & ~2) | ((byte & 1) << 1);
-        saa_write_reg (SAA7196_STDC, saa_regs[pb->win.norm][SAA7196_STDC]);
-
-        /* Let's wait 30msec for this one */
-        msleep_interruptible(30);
-
-        return (unsigned char)in_8 (&planb_regs->saa_status);
-}
-
-static void saa_set(unsigned char addr, unsigned char val, struct planb *pb)
-{
-        if(saa_regs[pb->win.norm][addr] != val) {
-                saa_regs[pb->win.norm][addr] = val;
-                saa_write_reg (addr, val);
-        }
-        return;
-}
-
-static void saa_init_regs(struct planb *pb)
-{
-        int i;
-
-        for (i = 0; i < SAA7196_NUMREGS; i++)
-                saa_write_reg (i, saa_regs[pb->win.norm][i]);
-}
-
-static unsigned int saa_geo_setup(int width, int height, int interlace, int bpp,
-        struct planb *pb)
-{
-        int ht, norm = pb->win.norm;
-
-        switch(bpp) {
-        case 2:
-                /* RGB555+a 1x16-bit + 16-bit transparent */
-                saa_regs[norm][SAA7196_FMTS] &= ~0x3;
-                break;
-        case 1:
-        case 4:
-                /* RGB888 1x24-bit + 8-bit transparent */
-                saa_regs[norm][SAA7196_FMTS] &= ~0x1;
-                saa_regs[norm][SAA7196_FMTS] |= 0x2;
-                break;
-        default:
-                return -EINVAL;
-        }
-        ht = (interlace ? height / 2 : height);
-        saa_regs[norm][SAA7196_OUTPIX] = (unsigned char) (width & 0x00ff);
-        saa_regs[norm][SAA7196_HFILT] = (saa_regs[norm][SAA7196_HFILT] & ~0x3)
-                                                | (width >> 8 & 0x3);
-        saa_regs[norm][SAA7196_OUTLINE] = (unsigned char) (ht & 0xff);
-        saa_regs[norm][SAA7196_VYP] = (saa_regs[norm][SAA7196_VYP] & ~0x3)
-                                                | (ht >> 8 & 0x3);
-        /* feed both fields if interlaced, or else feed only even fields */
-        saa_regs[norm][SAA7196_FMTS] = (interlace) ?
-                                        (saa_regs[norm][SAA7196_FMTS] & ~0x60)
-                                        : (saa_regs[norm][SAA7196_FMTS] | 0x60);
-        /* transparent mode; extended format enabled */
-        saa_regs[norm][SAA7196_DPATH] |= 0x3;
-
-        return 0;
-}
-
-/***************************/
-/* DBDMA support functions */
-/***************************/
-
-static inline void planb_dbdma_restart(volatile struct dbdma_regs *ch)
-{
-        out_le32(&ch->control, PLANB_CLR(RUN));
-        out_le32(&ch->control, PLANB_SET(RUN|WAKE) | PLANB_CLR(PAUSE));
-}
-
-static inline void planb_dbdma_stop(volatile struct dbdma_regs *ch)
-{
-        int i = 0;
-
-        out_le32(&ch->control, PLANB_CLR(RUN) | PLANB_SET(FLUSH));
-        while((in_le32(&ch->status) == (ACTIVE | FLUSH)) && (i < 999)) {
-                IDEBUG("PlanB: waiting for DMA to stop\n");
-                i++;
-        }
-}
-
-static inline void tab_cmd_dbdma(volatile struct dbdma_cmd *ch,
-        unsigned short command, unsigned int cmd_dep)
-{
-        st_le16(&ch->command, command);
-        st_le32(&ch->cmd_dep, cmd_dep);
-}
-
-static inline void tab_cmd_store(volatile struct dbdma_cmd *ch,
-        unsigned int phy_addr, unsigned int cmd_dep)
-{
-        st_le16(&ch->command, STORE_WORD | KEY_SYSTEM);
-        st_le16(&ch->req_count, 4);
-        st_le32(&ch->phy_addr, phy_addr);
-        st_le32(&ch->cmd_dep, cmd_dep);
-}
-
-static inline void tab_cmd_gen(volatile struct dbdma_cmd *ch,
-        unsigned short command, unsigned short req_count,
-        unsigned int phy_addr, unsigned int cmd_dep)
-{
-        st_le16(&ch->command, command);
-        st_le16(&ch->req_count, req_count);
-        st_le32(&ch->phy_addr, phy_addr);
-        st_le32(&ch->cmd_dep, cmd_dep);
-}
-
-static volatile struct dbdma_cmd *cmd_geo_setup(
-        volatile struct dbdma_cmd *c1, int width, int height, int interlace,
-        int bpp, int clip, struct planb *pb)
-{
-        int norm = pb->win.norm;
-
-        if((saa_geo_setup(width, height, interlace, bpp, pb)) != 0)
-                return (volatile struct dbdma_cmd *)NULL;
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_FMTS);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_FMTS]);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_DPATH);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_DPATH]);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->even),
-                                        bpp | ((clip)? PLANB_CLIPMASK: 0));
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->odd),
-                                        bpp | ((clip)? PLANB_CLIPMASK: 0));
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_OUTPIX);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_OUTPIX]);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_HFILT);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_HFILT]);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_OUTLINE);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_OUTLINE]);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_addr),
-                                                        SAA7196_VYP);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->saa_regval),
-                                        saa_regs[norm][SAA7196_VYP]);
-        return c1;
-}
-
-/******************************/
-/* misc. supporting functions */
-/******************************/
-
-static inline void planb_lock(struct planb *pb)
-{
-        mutex_lock(&pb->lock);
-}
-
-static inline void planb_unlock(struct planb *pb)
-{
-        mutex_unlock(&pb->lock);
-}
-
-/***************/
-/* Driver Core */
-/***************/
-
-static int planb_prepare_open(struct planb *pb)
-{
-        int     i, size;
-
-        /* allocate memory for two plus alpha command buffers (size: max lines,
-           plus 40 commands handling, plus 1 alignment), plus dummy command buf,
-           plus clipmask buffer, plus frame grabbing status */
-        size = (pb->tab_size*(2+MAX_GBUFFERS*TAB_FACTOR)+1+MAX_GBUFFERS
-                * PLANB_DUMMY)*sizeof(struct dbdma_cmd)
-                +(PLANB_MAXLINES*((PLANB_MAXPIXELS+7)& ~7))/8
-                +MAX_GBUFFERS*sizeof(unsigned int);
-        if ((pb->priv_space = kzalloc (size, GFP_KERNEL)) == 0)
-                return -ENOMEM;
-        pb->overlay_last1 = pb->ch1_cmd = (volatile struct dbdma_cmd *)
-                                                DBDMA_ALIGN (pb->priv_space);
-        pb->overlay_last2 = pb->ch2_cmd = pb->ch1_cmd + pb->tab_size;
-        pb->ch1_cmd_phys = virt_to_bus(pb->ch1_cmd);
-        pb->cap_cmd[0] = pb->ch2_cmd + pb->tab_size;
-        pb->pre_cmd[0] = pb->cap_cmd[0] + pb->tab_size * TAB_FACTOR;
-        for (i = 1; i < MAX_GBUFFERS; i++) {
-                pb->cap_cmd[i] = pb->pre_cmd[i-1] + PLANB_DUMMY;
-                pb->pre_cmd[i] = pb->cap_cmd[i] + pb->tab_size * TAB_FACTOR;
-        }
-        pb->frame_stat=(volatile unsigned int *)(pb->pre_cmd[MAX_GBUFFERS-1]
-                                                + PLANB_DUMMY);
-        pb->mask = (unsigned char *)(pb->frame_stat+MAX_GBUFFERS);
-
-        pb->rawbuf = NULL;
-        pb->rawbuf_size = 0;
-        pb->grabbing = 0;
-        for (i = 0; i < MAX_GBUFFERS; i++) {
-                pb->frame_stat[i] = GBUFFER_UNUSED;
-                pb->gwidth[i] = 0;
-                pb->gheight[i] = 0;
-                pb->gfmt[i] = 0;
-                pb->gnorm_switch[i] = 0;
-#ifndef PLANB_GSCANLINE
-                pb->lsize[i] = 0;
-                pb->lnum[i] = 0;
-#endif /* PLANB_GSCANLINE */
-        }
-        pb->gcount = 0;
-        pb->suspend = 0;
-        pb->last_fr = -999;
-        pb->prev_last_fr = -999;
-
-        /* Reset DMA controllers */
-        planb_dbdma_stop(&pb->planb_base->ch2);
-        planb_dbdma_stop(&pb->planb_base->ch1);
-
-        return 0;
-}
-
-static void planb_prepare_close(struct planb *pb)
-{
-        int i;
-
-        /* make sure the dma's are idle */
-        planb_dbdma_stop(&pb->planb_base->ch2);
-        planb_dbdma_stop(&pb->planb_base->ch1);
-        /* free kernel memory of command buffers */
-        if(pb->priv_space != 0) {
-                kfree (pb->priv_space);
-                pb->priv_space = 0;
-                pb->cmd_buff_inited = 0;
-        }
-        if(pb->rawbuf) {
-                for (i = 0; i < pb->rawbuf_size; i++) {
-                        ClearPageReserved(virt_to_page(pb->rawbuf[i]));
-                        free_pages((unsigned long)pb->rawbuf[i], 0);
-                }
-                kfree(pb->rawbuf);
-        }
-        pb->rawbuf = NULL;
-}
-
-/*****************************/
-/* overlay support functions */
-/*****************************/
-
-static inline int overlay_is_active(struct planb *pb)
-{
-        unsigned int size = pb->tab_size * sizeof(struct dbdma_cmd);
-        unsigned int caddr = (unsigned)in_le32(&pb->planb_base->ch1.cmdptr);
-
-        return (in_le32(&pb->overlay_last1->cmd_dep) == pb->ch1_cmd_phys)
-                        && (caddr < (pb->ch1_cmd_phys + size))
-                        && (caddr >= (unsigned)pb->ch1_cmd_phys);
-}
-
-static void overlay_start(struct planb *pb)
-{
-
-        DEBUG("PlanB: overlay_start()\n");
-
-        if(ACTIVE & in_le32(&pb->planb_base->ch1.status)) {
-
-                DEBUG("PlanB: presumably, grabbing is in progress...\n");
-
-                planb_dbdma_stop(&pb->planb_base->ch2);
-                out_le32 (&pb->planb_base->ch2.cmdptr,
-                                                virt_to_bus(pb->ch2_cmd));
-                planb_dbdma_restart(&pb->planb_base->ch2);
-                st_le16 (&pb->ch1_cmd->command, DBDMA_NOP);
-                tab_cmd_dbdma(pb->last_cmd[pb->last_fr],
-                                        DBDMA_NOP | BR_ALWAYS,
-                                        virt_to_bus(pb->ch1_cmd));
-                eieio();
-                pb->prev_last_fr = pb->last_fr;
-                pb->last_fr = -2;
-                if(!(ACTIVE & in_le32(&pb->planb_base->ch1.status))) {
-                        IDEBUG("PlanB: became inactive "
-                                "in the mean time... reactivating\n");
-                        planb_dbdma_stop(&pb->planb_base->ch1);
-                        out_le32 (&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->ch1_cmd));
-                        planb_dbdma_restart(&pb->planb_base->ch1);
-                }
-        } else {
-
-                DEBUG("PlanB: currently idle, so can do whatever\n");
-
-                planb_dbdma_stop(&pb->planb_base->ch2);
-                planb_dbdma_stop(&pb->planb_base->ch1);
-                st_le32 (&pb->planb_base->ch2.cmdptr,
-                                                virt_to_bus(pb->ch2_cmd));
-                st_le32 (&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->ch1_cmd));
-                out_le16 (&pb->ch1_cmd->command, DBDMA_NOP);
-                planb_dbdma_restart(&pb->planb_base->ch2);
-                planb_dbdma_restart(&pb->planb_base->ch1);
-                pb->last_fr = -1;
-        }
-        return;
-}
-
-static void overlay_stop(struct planb *pb)
-{
-        DEBUG("PlanB: overlay_stop()\n");
-
-        if(pb->last_fr == -1) {
-
-                DEBUG("PlanB: no grabbing, it seems...\n");
-
-                planb_dbdma_stop(&pb->planb_base->ch2);
-                planb_dbdma_stop(&pb->planb_base->ch1);
-                pb->last_fr = -999;
-        } else if(pb->last_fr == -2) {
-                unsigned int cmd_dep;
-                tab_cmd_dbdma(pb->cap_cmd[pb->prev_last_fr], DBDMA_STOP, 0);
-                eieio();
-                cmd_dep = (unsigned int)in_le32(&pb->overlay_last1->cmd_dep);
-                if(overlay_is_active(pb)) {
-
-                        DEBUG("PlanB: overlay is currently active\n");
-
-                        planb_dbdma_stop(&pb->planb_base->ch2);
-                        planb_dbdma_stop(&pb->planb_base->ch1);
-                        if(cmd_dep != pb->ch1_cmd_phys) {
-                                out_le32(&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->overlay_last1));
-                                planb_dbdma_restart(&pb->planb_base->ch1);
-                        }
-                }
-                pb->last_fr = pb->prev_last_fr;
-                pb->prev_last_fr = -999;
-        }
-        return;
-}
-
-static void suspend_overlay(struct planb *pb)
-{
-        int fr = -1;
-        struct dbdma_cmd last;
-
-        DEBUG("PlanB: suspend_overlay: %d\n", pb->suspend);
-
-        if(pb->suspend++)
-                return;
-        if(ACTIVE & in_le32(&pb->planb_base->ch1.status)) {
-                if(pb->last_fr == -2) {
-                        fr = pb->prev_last_fr;
-                        memcpy(&last, (void*)pb->last_cmd[fr], sizeof(last));
-                        tab_cmd_dbdma(pb->last_cmd[fr], DBDMA_STOP, 0);
-                }
-                if(overlay_is_active(pb)) {
-                        planb_dbdma_stop(&pb->planb_base->ch2);
-                        planb_dbdma_stop(&pb->planb_base->ch1);
-                        pb->suspended.overlay = 1;
-                        pb->suspended.frame = fr;
-                        memcpy(&pb->suspended.cmd, &last, sizeof(last));
-                        return;
-                }
-        }
-        pb->suspended.overlay = 0;
-        pb->suspended.frame = fr;
-        memcpy(&pb->suspended.cmd, &last, sizeof(last));
-        return;
-}
-
-static void resume_overlay(struct planb *pb)
-{
-
-        DEBUG("PlanB: resume_overlay: %d\n", pb->suspend);
-
-        if(pb->suspend > 1)
-                return;
-        if(pb->suspended.frame != -1) {
-                memcpy((void*)pb->last_cmd[pb->suspended.frame],
-                                &pb->suspended.cmd, sizeof(pb->suspended.cmd));
-        }
-        if(ACTIVE & in_le32(&pb->planb_base->ch1.status)) {
-                goto finish;
-        }
-        if(pb->suspended.overlay) {
-
-                DEBUG("PlanB: overlay being resumed\n");
-
-                st_le16 (&pb->ch1_cmd->command, DBDMA_NOP);
-                st_le16 (&pb->ch2_cmd->command, DBDMA_NOP);
-                /* Set command buffer addresses */
-                st_le32(&pb->planb_base->ch1.cmdptr,
-                                        virt_to_bus(pb->overlay_last1));
-                out_le32(&pb->planb_base->ch2.cmdptr,
-                                        virt_to_bus(pb->overlay_last2));
-                /* Start the DMA controller */
-                out_le32 (&pb->planb_base->ch2.control,
-                                PLANB_CLR(PAUSE) | PLANB_SET(RUN|WAKE));
-                out_le32 (&pb->planb_base->ch1.control,
-                                PLANB_CLR(PAUSE) | PLANB_SET(RUN|WAKE));
-        } else if(pb->suspended.frame != -1) {
-                out_le32(&pb->planb_base->ch1.cmdptr,
-                                virt_to_bus(pb->last_cmd[pb->suspended.frame]));
-                out_le32 (&pb->planb_base->ch1.control,
-                                PLANB_CLR(PAUSE) | PLANB_SET(RUN|WAKE));
-        }
-
-finish:
-        pb->suspend--;
-        wake_up_interruptible(&pb->suspendq);
-}
-
-static void add_clip(struct planb *pb, struct video_clip *clip)
-{
-        volatile unsigned char  *base;
-        int     xc = clip->x, yc = clip->y;
-        int     wc = clip->width, hc = clip->height;
-        int     ww = pb->win.width, hw = pb->win.height;
-        int     x, y, xtmp1, xtmp2;
-
-        DEBUG("PlanB: clip %dx%d+%d+%d\n", wc, hc, xc, yc);
-
-        if(xc < 0) {
-                wc += xc;
-                xc = 0;
-        }
-        if(yc < 0) {
-                hc += yc;
-                yc = 0;
-        }
-        if(xc + wc > ww)
-                wc = ww - xc;
-        if(wc <= 0) /* Nothing to do */
-                return;
-        if(yc + hc > hw)
-                hc = hw - yc;
-
-        for (y = yc; y < yc+hc; y++) {
-                xtmp1=xc>>3;
-                xtmp2=(xc+wc)>>3;
-                base = pb->mask + y*96;
-                if(xc != 0 || wc >= 8)
-                        *(base + xtmp1) &= (unsigned char)(0x00ff &
-                                (0xff00 >> (xc&7)));
-                for (x = xtmp1 + 1; x < xtmp2; x++) {
-                        *(base + x) = 0;
-                }
-                if(xc < (ww & ~0x7))
-                        *(base + xtmp2) &= (unsigned char)(0x00ff >>
-                                ((xc+wc) & 7));
-        }
-
-        return;
-}
-
-static void fill_cmd_buff(struct planb *pb)
-{
-        int restore = 0;
-        volatile struct dbdma_cmd last;
-
-        DEBUG("PlanB: fill_cmd_buff()\n");
-
-        if(pb->overlay_last1 != pb->ch1_cmd) {
-                restore = 1;
-                last = *(pb->overlay_last1);
-        }
-        memset ((void *) pb->ch1_cmd, 0, 2 * pb->tab_size
-                                        * sizeof(struct dbdma_cmd));
-        cmd_buff (pb);
-        if(restore)
-                *(pb->overlay_last1) = last;
-        if(pb->suspended.overlay) {
-                unsigned long jump_addr = in_le32(&pb->overlay_last1->cmd_dep);
-                if(jump_addr != pb->ch1_cmd_phys) {
-                        int i;
-
-                        DEBUG("PlanB: adjusting ch1's jump address\n");
-
-                        for(i = 0; i < MAX_GBUFFERS; i++) {
-                                if(pb->need_pre_capture[i]) {
-                                    if(jump_addr == virt_to_bus(pb->pre_cmd[i]))
-                                        goto found;
-                                } else {
-                                    if(jump_addr == virt_to_bus(pb->cap_cmd[i]))
-                                        goto found;
-                                }
-                        }
-
-                        DEBUG("PlanB: not found...\n");
-
-                        goto out;
-found:
-                        if(pb->need_pre_capture[i])
-                                out_le32(&pb->pre_cmd[i]->phy_addr,
-                                                virt_to_bus(pb->overlay_last1));
-                        else
-                                out_le32(&pb->cap_cmd[i]->phy_addr,
-                                                virt_to_bus(pb->overlay_last1));
-                }
-        }
-out:
-        pb->cmd_buff_inited = 1;
-
-        return;
-}
-
-static void cmd_buff(struct planb *pb)
-{
-        int             i, bpp, count, nlines, stepsize, interlace;
-        unsigned long   base, jump, addr_com, addr_dep;
-        volatile struct dbdma_cmd *c1 = pb->ch1_cmd;
-        volatile struct dbdma_cmd *c2 = pb->ch2_cmd;
-
-        interlace = pb->win.interlace;
-        bpp = pb->win.bpp;
-        count = (bpp * ((pb->win.x + pb->win.width > pb->win.swidth) ?
-                (pb->win.swidth - pb->win.x) : pb->win.width));
-        nlines = ((pb->win.y + pb->win.height > pb->win.sheight) ?
-                (pb->win.sheight - pb->win.y) : pb->win.height);
-
-        /* Do video in: */
-
-        /* Preamble commands: */
-        addr_com = virt_to_bus(c1);
-        addr_dep = virt_to_bus(&c1->cmd_dep);
-        tab_cmd_dbdma(c1++, DBDMA_NOP, 0);
-        jump = virt_to_bus(c1+16); /* 14 by cmd_geo_setup() and 2 for padding */
-        if((c1 = cmd_geo_setup(c1, pb->win.width, pb->win.height, interlace,
-                                        bpp, 1, pb)) == NULL) {
-                printk(KERN_WARNING "PlanB: encountered serious problems\n");
-                tab_cmd_dbdma(pb->ch1_cmd + 1, DBDMA_STOP, 0);
-                tab_cmd_dbdma(pb->ch2_cmd + 1, DBDMA_STOP, 0);
-                return;
-        }
-        tab_cmd_store(c1++, addr_com, (unsigned)(DBDMA_NOP | BR_ALWAYS) << 16);
-        tab_cmd_store(c1++, addr_dep, jump);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.wait_sel),
-                                                        PLANB_SET(FIELD_SYNC));
-                /* (1) wait for field sync to be set */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                                                        PLANB_SET(ODD_FIELD));
-                /* wait for field sync to be cleared */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-                /* if not odd field, wait until field sync is set again */
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFSET, virt_to_bus(c1-3)); c1++;
-                /* assert ch_sync to ch2 */
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch2.control),
-                                                        PLANB_SET(CH_SYNC));
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                                                        PLANB_SET(DMA_ABORT));
-
-        base = (pb->frame_buffer_phys + pb->offset + pb->win.y * (pb->win.bpl
-                                        + pb->win.pad) + pb->win.x * bpp);
-
-        if (interlace) {
-                stepsize = 2;
-                jump = virt_to_bus(c1 + (nlines + 1) / 2);
-        } else {
-                stepsize = 1;
-                jump = virt_to_bus(c1 + nlines);
-        }
-
-        /* even field data: */
-        for (i=0; i < nlines; i += stepsize, c1++)
-                tab_cmd_gen(c1, INPUT_MORE | KEY_STREAM0 | BR_IFSET,
-                        count, base + i * (pb->win.bpl + pb->win.pad), jump);
-
-        /* For non-interlaced, we use even fields only */
-        if (!interlace)
-                goto cmd_tab_data_end;
-
-        /* Resync to odd field */
-                /* (2) wait for field sync to be set */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                                                        PLANB_SET(ODD_FIELD));
-                /* wait for field sync to be cleared */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-                /* if not odd field, wait until field sync is set again */
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFCLR, virt_to_bus(c1-3)); c1++;
-                /* assert ch_sync to ch2 */
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch2.control),
-                                                        PLANB_SET(CH_SYNC));
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                                                        PLANB_SET(DMA_ABORT));
-
-        /* odd field data: */
-        jump = virt_to_bus(c1 + nlines / 2);
-        for (i=1; i < nlines; i += stepsize, c1++)
-                tab_cmd_gen(c1, INPUT_MORE | KEY_STREAM0 | BR_IFSET, count,
-                        base + i * (pb->win.bpl + pb->win.pad), jump);
-
-        /* And jump back to the start */
-cmd_tab_data_end:
-        pb->overlay_last1 = c1; /* keep a pointer to the last command */
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_ALWAYS, virt_to_bus(pb->ch1_cmd));
-
-        /* Clipmask command buffer */
-
-        /* Preamble commands: */
-        tab_cmd_dbdma(c2++, DBDMA_NOP, 0);
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.wait_sel),
-                                                        PLANB_SET(CH_SYNC));
-                /* wait until ch1 asserts ch_sync */
-        tab_cmd_dbdma(c2++, DBDMA_NOP | WAIT_IFCLR, 0);
-                /* clear ch_sync asserted by ch1 */
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.control),
-                                                        PLANB_CLR(CH_SYNC));
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.wait_sel),
-                                                        PLANB_SET(FIELD_SYNC));
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.br_sel),
-                                                        PLANB_SET(ODD_FIELD));
-
-        /* jump to end of even field if appropriate */
-        /* this points to (interlace)? pos. C: pos. B */
-        jump = (interlace) ? virt_to_bus(c2 + (nlines + 1) / 2 + 2):
-                                                virt_to_bus(c2 + nlines + 2);
-                /* if odd field, skip over to odd field clipmasking */
-        tab_cmd_dbdma(c2++, DBDMA_NOP | BR_IFSET, jump);
-
-        /* even field mask: */
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.br_sel),
-                                                        PLANB_SET(DMA_ABORT));
-        /* this points to pos. B */
-        jump = (interlace) ? virt_to_bus(c2 + nlines + 1):
-                                                virt_to_bus(c2 + nlines);
-        base = virt_to_bus(pb->mask);
-        for (i=0; i < nlines; i += stepsize, c2++)
-                tab_cmd_gen(c2, OUTPUT_MORE | KEY_STREAM0 | BR_IFSET, 96,
-                        base + i * 96, jump);
-
-        /* For non-interlaced, we use only even fields */
-        if(!interlace)
-                goto cmd_tab_mask_end;
-
-        /* odd field mask: */
-/* C */ tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch2.br_sel),
-                                                        PLANB_SET(DMA_ABORT));
-        /* this points to pos. B */
-        jump = virt_to_bus(c2 + nlines / 2);
-        base = virt_to_bus(pb->mask);
-        for (i=1; i < nlines; i += 2, c2++)     /* abort if set */
-                tab_cmd_gen(c2, OUTPUT_MORE | KEY_STREAM0 | BR_IFSET, 96,
-                        base + i * 96, jump);
-
-        /* Inform channel 1 and jump back to start */
-cmd_tab_mask_end:
-        /* ok, I just realized this is kind of flawed. */
-        /* this part is reached only after odd field clipmasking. */
-        /* wanna clean up? */
-                /* wait for field sync to be set */
-                /* corresponds to fsync (1) of ch1 */
-/* B */ tab_cmd_dbdma(c2++, DBDMA_NOP | WAIT_IFCLR, 0);
-                /* restart ch1, meant to clear any dead bit or something */
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch1.control),
-                                                        PLANB_CLR(RUN));
-        tab_cmd_store(c2++, (unsigned)(&pb->planb_base_phys->ch1.control),
-                                                        PLANB_SET(RUN));
-        pb->overlay_last2 = c2; /* keep a pointer to the last command */
-                /* start over even field clipmasking */
-        tab_cmd_dbdma(c2, DBDMA_NOP | BR_ALWAYS, virt_to_bus(pb->ch2_cmd));
-
-        eieio();
-        return;
-}
-
-/*********************************/
-/* grabdisplay support functions */
-/*********************************/
-
-static int palette2fmt[] = {
-        0,
-        PLANB_GRAY,
-        0,
-        0,
-        0,
-        PLANB_COLOUR32,
-        PLANB_COLOUR15,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-};
-
-#define PLANB_PALETTE_MAX 15
-
-static int vgrab(struct planb *pb, struct video_mmap *mp)
-{
-        unsigned int fr = mp->frame;
-        unsigned int format;
-
-        if(pb->rawbuf==NULL) {
-                int err;
-                if((err=grabbuf_alloc(pb)))
-                        return err;
-        }
-
-        IDEBUG("PlanB: grab %d: %dx%d(%u)\n", pb->grabbing,
-                                                mp->width, mp->height, fr);
-
-        if(pb->grabbing >= MAX_GBUFFERS)
-                return -ENOBUFS;
-        if(fr > (MAX_GBUFFERS - 1) || fr < 0)
-                return -EINVAL;
-        if(mp->height <= 0 || mp->width <= 0)
-                return -EINVAL;
-        if(mp->format < 0 || mp->format >= PLANB_PALETTE_MAX)
-                return -EINVAL;
-        if((format = palette2fmt[mp->format]) == 0)
-                return -EINVAL;
-        if (mp->height * mp->width * format > PLANB_MAX_FBUF) /* format = bpp */
-                return -EINVAL;
-
-        planb_lock(pb);
-        if(mp->width != pb->gwidth[fr] || mp->height != pb->gheight[fr] ||
-                        format != pb->gfmt[fr] || (pb->gnorm_switch[fr])) {
-                int i;
-#ifndef PLANB_GSCANLINE
-                unsigned int osize = pb->gwidth[fr] * pb->gheight[fr]
-                                                                * pb->gfmt[fr];
-                unsigned int nsize = mp->width * mp->height * format;
-#endif
-
-                IDEBUG("PlanB: gwidth = %d, gheight = %d, mp->format = %u\n",
-                                        mp->width, mp->height, mp->format);
-
-#ifndef PLANB_GSCANLINE
-                if(pb->gnorm_switch[fr])
-                        nsize = 0;
-                if (nsize < osize) {
-                        for(i = pb->gbuf_idx[fr]; osize > 0; i++) {
-                                memset((void *)pb->rawbuf[i], 0, PAGE_SIZE);
-                                osize -= PAGE_SIZE;
-                        }
-                }
-                for(i = pb->l_fr_addr_idx[fr]; i < pb->l_fr_addr_idx[fr]
-                                                        + pb->lnum[fr]; i++)
-                        memset((void *)pb->rawbuf[i], 0, PAGE_SIZE);
-#else
-/* XXX TODO */
-/*
-                if(pb->gnorm_switch[fr])
-                        memset((void *)pb->gbuffer[fr], 0,
-                                        pb->gbytes_per_line * pb->gheight[fr]);
-                else {
-                        if(mp->
-                        for(i = 0; i < pb->gheight[fr]; i++) {
-                                memset((void *)(pb->gbuffer[fr]
-                                        + pb->gbytes_per_line * i
-                        }
-                }
-*/
-#endif
-                pb->gwidth[fr] = mp->width;
-                pb->gheight[fr] = mp->height;
-                pb->gfmt[fr] = format;
-                pb->last_cmd[fr] = setup_grab_cmd(fr, pb);
-                planb_pre_capture(fr, pb->gfmt[fr], pb); /* gfmt = bpp */
-                pb->need_pre_capture[fr] = 1;
-                pb->gnorm_switch[fr] = 0;
-        } else
-                pb->need_pre_capture[fr] = 0;
-        pb->frame_stat[fr] = GBUFFER_GRABBING;
-        if(!(ACTIVE & in_le32(&pb->planb_base->ch1.status))) {
-
-                IDEBUG("PlanB: ch1 inactive, initiating grabbing\n");
-
-                planb_dbdma_stop(&pb->planb_base->ch1);
-                if(pb->need_pre_capture[fr]) {
-
-                        IDEBUG("PlanB: padding pre-capture sequence\n");
-
-                        out_le32 (&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->pre_cmd[fr]));
-                } else {
-                        tab_cmd_dbdma(pb->last_cmd[fr], DBDMA_STOP, 0);
-                        tab_cmd_dbdma(pb->cap_cmd[fr], DBDMA_NOP, 0);
-                /* let's be on the safe side. here is not timing critical. */
-                        tab_cmd_dbdma((pb->cap_cmd[fr] + 1), DBDMA_NOP, 0);
-                        out_le32 (&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->cap_cmd[fr]));
-                }
-                planb_dbdma_restart(&pb->planb_base->ch1);
-                pb->last_fr = fr;
-        } else {
-                int i;
-
-                IDEBUG("PlanB: ch1 active, grabbing being queued\n");
-
-                if((pb->last_fr == -1) || ((pb->last_fr == -2) &&
-                                                overlay_is_active(pb))) {
-
-                        IDEBUG("PlanB: overlay is active, grabbing defered\n");
-
-                        tab_cmd_dbdma(pb->last_cmd[fr],
-                                        DBDMA_NOP | BR_ALWAYS,
-                                        virt_to_bus(pb->ch1_cmd));
-                        if(pb->need_pre_capture[fr]) {
-
-                                IDEBUG("PlanB: padding pre-capture sequence\n");
-
-                                tab_cmd_store(pb->pre_cmd[fr],
-                                    virt_to_bus(&pb->overlay_last1->cmd_dep),
-                                                virt_to_bus(pb->ch1_cmd));
-                                eieio();
-                                out_le32 (&pb->overlay_last1->cmd_dep,
-                                                virt_to_bus(pb->pre_cmd[fr]));
-                        } else {
-                                tab_cmd_store(pb->cap_cmd[fr],
-                                    virt_to_bus(&pb->overlay_last1->cmd_dep),
-                                                virt_to_bus(pb->ch1_cmd));
-                                tab_cmd_dbdma((pb->cap_cmd[fr] + 1),
-                                                                DBDMA_NOP, 0);
-                                eieio();
-                                out_le32 (&pb->overlay_last1->cmd_dep,
-                                                virt_to_bus(pb->cap_cmd[fr]));
-                        }
-                        for(i = 0; overlay_is_active(pb) && i < 999; i++)
-                                IDEBUG("PlanB: waiting for overlay done\n");
-                        tab_cmd_dbdma(pb->ch1_cmd, DBDMA_NOP, 0);
-                        pb->prev_last_fr = fr;
-                        pb->last_fr = -2;
-                } else if(pb->last_fr == -2) {
-
-                        IDEBUG("PlanB: mixed mode detected, grabbing"
-                                " will be done before activating overlay\n");
-
-                        tab_cmd_dbdma(pb->ch1_cmd, DBDMA_NOP, 0);
-                        if(pb->need_pre_capture[fr]) {
-
-                                IDEBUG("PlanB: padding pre-capture sequence\n");
-
-                                tab_cmd_dbdma(pb->last_cmd[pb->prev_last_fr],
-                                                DBDMA_NOP | BR_ALWAYS,
-                                                virt_to_bus(pb->pre_cmd[fr]));
-                                eieio();
-                        } else {
-                                tab_cmd_dbdma(pb->cap_cmd[fr], DBDMA_NOP, 0);
-                                if(pb->gwidth[pb->prev_last_fr] !=
-                                                                pb->gwidth[fr]
-                                        || pb->gheight[pb->prev_last_fr] !=
-                                                                pb->gheight[fr]
-                                        || pb->gfmt[pb->prev_last_fr] !=
-                                                                pb->gfmt[fr])
-                                        tab_cmd_dbdma((pb->cap_cmd[fr] + 1),
-                                                                DBDMA_NOP, 0);
-                                else
-                                        tab_cmd_dbdma((pb->cap_cmd[fr] + 1),
-                                            DBDMA_NOP | BR_ALWAYS,
-                                            virt_to_bus(pb->cap_cmd[fr] + 16));
-                                tab_cmd_dbdma(pb->last_cmd[pb->prev_last_fr],
-                                                DBDMA_NOP | BR_ALWAYS,
-                                                virt_to_bus(pb->cap_cmd[fr]));
-                                eieio();
-                        }
-                        tab_cmd_dbdma(pb->last_cmd[fr],
-                                        DBDMA_NOP | BR_ALWAYS,
-                                        virt_to_bus(pb->ch1_cmd));
-                        eieio();
-                        pb->prev_last_fr = fr;
-                        pb->last_fr = -2;
-                } else {
-
-                        IDEBUG("PlanB: active grabbing session detected\n");
-
-                        if(pb->need_pre_capture[fr]) {
-
-                                IDEBUG("PlanB: padding pre-capture sequence\n");
-
-                                tab_cmd_dbdma(pb->last_cmd[pb->last_fr],
-                                                DBDMA_NOP | BR_ALWAYS,
-                                                virt_to_bus(pb->pre_cmd[fr]));
-                                eieio();
-                        } else {
-                                tab_cmd_dbdma(pb->last_cmd[fr], DBDMA_STOP, 0);
-                                tab_cmd_dbdma(pb->cap_cmd[fr], DBDMA_NOP, 0);
-                                if(pb->gwidth[pb->last_fr] != pb->gwidth[fr]
-                                        || pb->gheight[pb->last_fr] !=
-                                                                pb->gheight[fr]
-                                        || pb->gfmt[pb->last_fr] !=
-                                                                pb->gfmt[fr])
-                                        tab_cmd_dbdma((pb->cap_cmd[fr] + 1),
-                                                                DBDMA_NOP, 0);
-                                else
-                                        tab_cmd_dbdma((pb->cap_cmd[fr] + 1),
-                                            DBDMA_NOP | BR_ALWAYS,
-                                            virt_to_bus(pb->cap_cmd[fr] + 16));
-                                tab_cmd_dbdma(pb->last_cmd[pb->last_fr],
-                                                DBDMA_NOP | BR_ALWAYS,
-                                                virt_to_bus(pb->cap_cmd[fr]));
-                                eieio();
-                        }
-                        pb->last_fr = fr;
-                }
-                if(!(ACTIVE & in_le32(&pb->planb_base->ch1.status))) {
-
-                        IDEBUG("PlanB: became inactive in the mean time..."
-                                "reactivating\n");
-
-                        planb_dbdma_stop(&pb->planb_base->ch1);
-                        out_le32 (&pb->planb_base->ch1.cmdptr,
-                                                virt_to_bus(pb->cap_cmd[fr]));
-                        planb_dbdma_restart(&pb->planb_base->ch1);
-                }
-        }
-        pb->grabbing++;
-        planb_unlock(pb);
-
-        return 0;
-}
-
-static void planb_pre_capture(int fr, int bpp, struct planb *pb)
-{
-        volatile struct dbdma_cmd *c1 = pb->pre_cmd[fr];
-        int interlace = (pb->gheight[fr] > pb->maxlines/2)? 1: 0;
-
-        tab_cmd_dbdma(c1++, DBDMA_NOP, 0);
-        if((c1 = cmd_geo_setup(c1, pb->gwidth[fr], pb->gheight[fr], interlace,
-                                                bpp, 0, pb)) == NULL) {
-                printk(KERN_WARNING "PlanB: encountered some problems\n");
-                tab_cmd_dbdma(pb->pre_cmd[fr] + 1, DBDMA_STOP, 0);
-                return;
-        }
-        /* Sync to even field */
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.wait_sel),
-                PLANB_SET(FIELD_SYNC));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(ODD_FIELD));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFSET, virt_to_bus(c1-3)); c1++;
-        tab_cmd_dbdma(c1++, DBDMA_NOP | INTR_ALWAYS, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(DMA_ABORT));
-        /* For non-interlaced, we use even fields only */
-        if (pb->gheight[fr] <= pb->maxlines/2)
-                goto cmd_tab_data_end;
-        /* Sync to odd field */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(ODD_FIELD));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFCLR, virt_to_bus(c1-3)); c1++;
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(DMA_ABORT));
-cmd_tab_data_end:
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_ALWAYS, virt_to_bus(pb->cap_cmd[fr]));
-
-        eieio();
-}
-
-static volatile struct dbdma_cmd *setup_grab_cmd(int fr, struct planb *pb)
-{
-        int             i, bpp, count, nlines, stepsize, interlace;
-#ifdef PLANB_GSCANLINE
-        int             scanline;
-#else
-        int             nlpp, leftover1;
-        unsigned long   base;
-#endif
-        unsigned long   jump;
-        int             pagei;
-        volatile struct dbdma_cmd *c1;
-        volatile struct dbdma_cmd *jump_addr;
-
-        c1 = pb->cap_cmd[fr];
-        interlace = (pb->gheight[fr] > pb->maxlines/2)? 1: 0;
-        bpp = pb->gfmt[fr];     /* gfmt = bpp */
-        count = bpp * pb->gwidth[fr];
-        nlines = pb->gheight[fr];
-#ifdef PLANB_GSCANLINE
-        scanline = pb->gbytes_per_line;
-#else
-        pb->lsize[fr] = count;
-        pb->lnum[fr] = 0;
-#endif
-
-        /* Do video in: */
-
-        /* Preamble commands: */
-        tab_cmd_dbdma(c1++, DBDMA_NOP, 0);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_ALWAYS, virt_to_bus(c1 + 16)); c1++;
-        if((c1 = cmd_geo_setup(c1, pb->gwidth[fr], pb->gheight[fr], interlace,
-                                                bpp, 0, pb)) == NULL) {
-                printk(KERN_WARNING "PlanB: encountered serious problems\n");
-                tab_cmd_dbdma(pb->cap_cmd[fr] + 1, DBDMA_STOP, 0);
-                return (pb->cap_cmd[fr] + 2);
-        }
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.wait_sel),
-                PLANB_SET(FIELD_SYNC));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(ODD_FIELD));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFSET, virt_to_bus(c1-3)); c1++;
-        tab_cmd_dbdma(c1++, DBDMA_NOP | INTR_ALWAYS, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(DMA_ABORT));
-
-        if (interlace) {
-                stepsize = 2;
-                jump_addr = c1 + TAB_FACTOR * (nlines + 1) / 2;
-        } else {
-                stepsize = 1;
-                jump_addr = c1 + TAB_FACTOR * nlines;
-        }
-        jump = virt_to_bus(jump_addr);
-
-        /* even field data: */
-
-        pagei = pb->gbuf_idx[fr];
-#ifdef PLANB_GSCANLINE
-        for (i = 0; i < nlines; i += stepsize) {
-                tab_cmd_gen(c1++, INPUT_MORE | BR_IFSET, count,
-                                        virt_to_bus(pb->rawbuf[pagei
-                                        + i * scanline / PAGE_SIZE]), jump);
-        }
-#else
-        i = 0;
-        leftover1 = 0;
-        do {
-            int j;
-
-            base = virt_to_bus(pb->rawbuf[pagei]);
-            nlpp = (PAGE_SIZE - leftover1) / count / stepsize;
-            for(j = 0; j < nlpp && i < nlines; j++, i += stepsize, c1++)
-                tab_cmd_gen(c1, INPUT_MORE | KEY_STREAM0 | BR_IFSET,
-                          count, base + count * j * stepsize + leftover1, jump);
-            if(i < nlines) {
-                int lov0 = PAGE_SIZE - count * nlpp * stepsize - leftover1;
-
-                if(lov0 == 0)
-                    leftover1 = 0;
-                else {
-                    if(lov0 >= count) {
-                        tab_cmd_gen(c1++, INPUT_MORE | BR_IFSET, count, base
-                                + count * nlpp * stepsize + leftover1, jump);
-                    } else {
-                        pb->l_to_addr[fr][pb->lnum[fr]] = pb->rawbuf[pagei]
-                                        + count * nlpp * stepsize + leftover1;
-                        pb->l_to_next_idx[fr][pb->lnum[fr]] = pagei + 1;
-                        pb->l_to_next_size[fr][pb->lnum[fr]] = count - lov0;
-                        tab_cmd_gen(c1++, INPUT_MORE | BR_IFSET, count,
-                                virt_to_bus(pb->rawbuf[pb->l_fr_addr_idx[fr]
-                                                + pb->lnum[fr]]), jump);
-                        if(++pb->lnum[fr] > MAX_LNUM)
-                                pb->lnum[fr]--;
-                    }
-                    leftover1 = count * stepsize - lov0;
-                    i += stepsize;
-                }
-            }
-            pagei++;
-        } while(i < nlines);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_ALWAYS, jump);
-        c1 = jump_addr;
-#endif /* PLANB_GSCANLINE */
-
-        /* For non-interlaced, we use even fields only */
-        if (!interlace)
-                goto cmd_tab_data_end;
-
-        /* Sync to odd field */
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFCLR, 0);
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(ODD_FIELD));
-        tab_cmd_dbdma(c1++, DBDMA_NOP | WAIT_IFSET, 0);
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFCLR, virt_to_bus(c1-3)); c1++;
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
-                PLANB_SET(DMA_ABORT));
-
-        /* odd field data: */
-        jump_addr = c1 + TAB_FACTOR * nlines / 2;
-        jump = virt_to_bus(jump_addr);
-#ifdef PLANB_GSCANLINE
-        for (i = 1; i < nlines; i += stepsize) {
-                tab_cmd_gen(c1++, INPUT_MORE | BR_IFSET, count,
-                                        virt_to_bus(pb->rawbuf[pagei
-                                        + i * scanline / PAGE_SIZE]), jump);
-        }
-#else
-        i = 1;
-        leftover1 = 0;
-        pagei = pb->gbuf_idx[fr];
-        if(nlines <= 1)
-            goto skip;
-        do {
-            int j;
-
-            base = virt_to_bus(pb->rawbuf[pagei]);
-            nlpp = (PAGE_SIZE - leftover1) / count / stepsize;
-            if(leftover1 >= count) {
-                tab_cmd_gen(c1++, INPUT_MORE | KEY_STREAM0 | BR_IFSET, count,
-                                                base + leftover1 - count, jump);
-                i += stepsize;
-            }
-            for(j = 0; j < nlpp && i < nlines; j++, i += stepsize, c1++)
-                tab_cmd_gen(c1, INPUT_MORE | KEY_STREAM0 | BR_IFSET, count,
-                        base + count * (j * stepsize + 1) + leftover1, jump);
-            if(i < nlines) {
-                int lov0 = PAGE_SIZE - count * nlpp * stepsize - leftover1;
-
-                if(lov0 == 0)
-                    leftover1 = 0;
-                else {
-                    if(lov0 > count) {
-                        pb->l_to_addr[fr][pb->lnum[fr]] = pb->rawbuf[pagei]
-                                + count * (nlpp * stepsize + 1) + leftover1;
-                        pb->l_to_next_idx[fr][pb->lnum[fr]] = pagei + 1;
-                        pb->l_to_next_size[fr][pb->lnum[fr]] = count * stepsize
-                                                                        - lov0;
-                        tab_cmd_gen(c1++, INPUT_MORE | BR_IFSET, count,
-                                virt_to_bus(pb->rawbuf[pb->l_fr_addr_idx[fr]
-                                                        + pb->lnum[fr]]), jump);
-                        if(++pb->lnum[fr] > MAX_LNUM)
-                                pb->lnum[fr]--;
-                        i += stepsize;
-                    }
-                    leftover1 = count * stepsize - lov0;
-                }
-            }
-            pagei++;
-        } while(i < nlines);
-skip:
-        tab_cmd_dbdma(c1, DBDMA_NOP | BR_ALWAYS, jump);
-        c1 = jump_addr;
-#endif /* PLANB_GSCANLINE */
-
-cmd_tab_data_end:
-        tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->intr_stat),
-                        (fr << 9) | PLANB_FRM_IRQ | PLANB_GEN_IRQ);
-        /* stop it */
-        tab_cmd_dbdma(c1, DBDMA_STOP, 0);
-
-        eieio();
-        return c1;
-}
-
-static irqreturn_t planb_irq(int irq, void *dev_id)
-{
-        unsigned int stat, astat;
-        struct planb *pb = (struct planb *)dev_id;
-
-        IDEBUG("PlanB: planb_irq()\n");
-
-        /* get/clear interrupt status bits */
-        eieio();
-        stat = in_le32(&pb->planb_base->intr_stat);
-        astat = stat & pb->intr_mask;
-        out_le32(&pb->planb_base->intr_stat, PLANB_FRM_IRQ
-                                        & ~astat & stat & ~PLANB_GEN_IRQ);
-        IDEBUG("PlanB: stat = %X, astat = %X\n", stat, astat);
-
-        if(astat & PLANB_FRM_IRQ) {
-                unsigned int fr = stat >> 9;
-#ifndef PLANB_GSCANLINE
-                int i;
-#endif
-                IDEBUG("PlanB: PLANB_FRM_IRQ\n");
-
-                pb->gcount++;
-
-                IDEBUG("PlanB: grab %d: fr = %d, gcount = %d\n",
-                                pb->grabbing, fr, pb->gcount);
-#ifndef PLANB_GSCANLINE
-                IDEBUG("PlanB: %d * %d bytes are being copied over\n",
-                                pb->lnum[fr], pb->lsize[fr]);
-                for(i = 0; i < pb->lnum[fr]; i++) {
-                        int first = pb->lsize[fr] - pb->l_to_next_size[fr][i];
-
-                        memcpy(pb->l_to_addr[fr][i],
-                                pb->rawbuf[pb->l_fr_addr_idx[fr] + i],
-                                first);
-                        memcpy(pb->rawbuf[pb->l_to_next_idx[fr][i]],
-                                pb->rawbuf[pb->l_fr_addr_idx[fr] + i] + first,
-                                                pb->l_to_next_size[fr][i]);
-                }
-#endif
-                pb->frame_stat[fr] = GBUFFER_DONE;
-                pb->grabbing--;
-                wake_up_interruptible(&pb->capq);
-                return IRQ_HANDLED;
-        }
-        /* incorrect interrupts? */
-        pb->intr_mask = PLANB_CLR_IRQ;
-        out_le32(&pb->planb_base->intr_stat, PLANB_CLR_IRQ);
-        printk(KERN_ERR "PlanB: IRQ lockup, cleared intrrupts"
-                                                        " unconditionally\n");
-        return IRQ_HANDLED;
-}
-
-/*******************************
- * Device Operations functions *
- *******************************/
-
-static int planb_open(struct video_device *dev, int mode)
-{
-        struct planb *pb = (struct planb *)dev;
-
-        if (pb->user == 0) {
-                int err;
-                if((err = planb_prepare_open(pb)) != 0)
-                        return err;
-        }
-        pb->user++;
-
-        DEBUG("PlanB: device opened\n");
-        return 0;
-}
-
-static void planb_close(struct video_device *dev)
-{
-        struct planb *pb = (struct planb *)dev;
-
-        if(pb->user < 1) /* ??? */
-                return;
-        planb_lock(pb);
-        if (pb->user == 1) {
-                if (pb->overlay) {
-                        planb_dbdma_stop(&pb->planb_base->ch2);
-                        planb_dbdma_stop(&pb->planb_base->ch1);
-                        pb->overlay = 0;
-                }
-                planb_prepare_close(pb);
-        }
-        pb->user--;
-        planb_unlock(pb);
-
-        DEBUG("PlanB: device closed\n");
-}
-
-static long planb_read(struct video_device *v, char *buf, unsigned long count,
-                                int nonblock)
-{
-        DEBUG("planb: read request\n");
-        return -EINVAL;
-}
-
-static long planb_write(struct video_device *v, const char *buf,
-                                unsigned long count, int nonblock)
-{
-        DEBUG("planb: write request\n");
-        return -EINVAL;
-}
-
-static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
-{
-        struct planb *pb=(struct planb *)dev;
-
-        switch (cmd)
-        {
-                case VIDIOCGCAP:
-                {
-                        struct video_capability b;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGCAP\n");
-
-                        strcpy (b.name, pb->video_dev.name);
-                        b.type = VID_TYPE_OVERLAY | VID_TYPE_CLIPPING |
-                                 VID_TYPE_FRAMERAM | VID_TYPE_SCALES |
-                                 VID_TYPE_CAPTURE;
-                        b.channels = 2; /* composite & svhs */
-                        b.audios = 0;
-                        b.maxwidth = PLANB_MAXPIXELS;
-                        b.maxheight = PLANB_MAXLINES;
-                        b.minwidth = 32; /* wild guess */
-                        b.minheight = 32;
-                        if (copy_to_user(arg,&b,sizeof(b)))
-                                return -EFAULT;
-                        return 0;
-                }
-                case VIDIOCSFBUF:
-                {
-                        struct video_buffer v;
-                        unsigned short bpp;
-                        unsigned int fmt;
-
-                        DEBUG("PlanB: IOCTL VIDIOCSFBUF\n");
-
-                        if (!capable(CAP_SYS_ADMIN)
-                        || !capable(CAP_SYS_RAWIO))
-                                return -EPERM;
-                        if (copy_from_user(&v, arg,sizeof(v)))
-                                return -EFAULT;
-                        planb_lock(pb);
-                        switch(v.depth) {
-                        case 8:
-                                bpp = 1;
-                                fmt = PLANB_GRAY;
-                                break;
-                        case 15:
-                        case 16:
-                                bpp = 2;
-                                fmt = PLANB_COLOUR15;
-                                break;
-                        case 24:
-                        case 32:
-                                bpp = 4;
-                                fmt = PLANB_COLOUR32;
-                                break;
-                        default:
-                                planb_unlock(pb);
-                                return -EINVAL;
-                        }
-                        if (bpp * v.width > v.bytesperline) {
-                                planb_unlock(pb);
-                                return -EINVAL;
-                        }
-                        pb->win.bpp = bpp;
-                        pb->win.color_fmt = fmt;
-                        pb->frame_buffer_phys = (unsigned long) v.base;
-                        pb->win.sheight = v.height;
-                        pb->win.swidth = v.width;
-                        pb->picture.depth = pb->win.depth = v.depth;
-                        pb->win.bpl = pb->win.bpp * pb->win.swidth;
-                        pb->win.pad = v.bytesperline - pb->win.bpl;
-
-                        DEBUG("PlanB: Display at %p is %d by %d, bytedepth %d,"
-                                " bpl %d (+ %d)\n", v.base, v.width,v.height,
-                                pb->win.bpp, pb->win.bpl, pb->win.pad);
-
-                        pb->cmd_buff_inited = 0;
-                        if(pb->overlay) {
-                                suspend_overlay(pb);
-                                fill_cmd_buff(pb);
-                                resume_overlay(pb);
-                        }
-                        planb_unlock(pb);
-                        return 0;
-                }
-                case VIDIOCGFBUF:
-                {
-                        struct video_buffer v;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGFBUF\n");
-
-                        v.base = (void *)pb->frame_buffer_phys;
-                        v.height = pb->win.sheight;
-                        v.width = pb->win.swidth;
-                        v.depth = pb->win.depth;
-                        v.bytesperline = pb->win.bpl + pb->win.pad;
-                        if (copy_to_user(arg, &v, sizeof(v)))
-                                return -EFAULT;
-                        return 0;
-                }
-                case VIDIOCCAPTURE:
-                {
-                        int i;
-
-                        if(copy_from_user(&i, arg, sizeof(i)))
-                                return -EFAULT;
-                        if(i==0) {
-                                DEBUG("PlanB: IOCTL VIDIOCCAPTURE Stop\n");
-
-                                if (!(pb->overlay))
-                                        return 0;
-                                planb_lock(pb);
-                                pb->overlay = 0;
-                                overlay_stop(pb);
-                                planb_unlock(pb);
-                        } else {
-                                DEBUG("PlanB: IOCTL VIDIOCCAPTURE Start\n");
-
-                                if (pb->frame_buffer_phys == 0 ||
-                                          pb->win.width == 0 ||
-                                          pb->win.height == 0)
-                                        return -EINVAL;
-                                if (pb->overlay)
-                                        return 0;
-                                planb_lock(pb);
-                                pb->overlay = 1;
-                                if(!(pb->cmd_buff_inited))
-                                        fill_cmd_buff(pb);
-                                overlay_start(pb);
-                                planb_unlock(pb);
-                        }
-                        return 0;
-                }
-                case VIDIOCGCHAN:
-                {
-                        struct video_channel v;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGCHAN\n");
-
-                        if(copy_from_user(&v, arg,sizeof(v)))
-                                return -EFAULT;
-                        v.flags = 0;
-                        v.tuners = 0;
-                        v.type = VIDEO_TYPE_CAMERA;
-                        v.norm = pb->win.norm;
-                        switch(v.channel)
-                        {
-                        case 0:
-                                strcpy(v.name,"Composite");
-                                break;
-                        case 1:
-                                strcpy(v.name,"SVHS");
-                                break;
-                        default:
-                                return -EINVAL;
-                                break;
-                        }
-                        if(copy_to_user(arg,&v,sizeof(v)))
-                                return -EFAULT;
-
-                        return 0;
-                }
-                case VIDIOCSCHAN:
-                {
-                        struct video_channel v;
-
-                        DEBUG("PlanB: IOCTL VIDIOCSCHAN\n");
-
-                        if(copy_from_user(&v, arg, sizeof(v)))
-                                return -EFAULT;
-
-                        if (v.norm != pb->win.norm) {
-                                int i, maxlines;
-
-                                switch (v.norm)
-                                {
-                                case VIDEO_MODE_PAL:
-                                case VIDEO_MODE_SECAM:
-                                        maxlines = PLANB_MAXLINES;
-                                        break;
-                                case VIDEO_MODE_NTSC:
-                                        maxlines = PLANB_NTSC_MAXLINES;
-                                        break;
-                                default:
-                                        return -EINVAL;
-                                        break;
-                                }
-                                planb_lock(pb);
-                                /* empty the grabbing queue */
-                                wait_event(pb->capq, !pb->grabbing);
-                                pb->maxlines = maxlines;
-                                pb->win.norm = v.norm;
-                                /* Stop overlay if running */
-                                suspend_overlay(pb);
-                                for(i = 0; i < MAX_GBUFFERS; i++)
-                                        pb->gnorm_switch[i] = 1;
-                                /* I know it's an overkill, but.... */
-                                fill_cmd_buff(pb);
-                                /* ok, now init it accordingly */
-                                saa_init_regs (pb);
-                                /* restart overlay if it was running */
-                                resume_overlay(pb);
-                                planb_unlock(pb);
-                        }
-
-                        switch(v.channel)
-                        {
-                        case 0: /* Composite    */
-                                saa_set (SAA7196_IOCC,
-                                        ((saa_regs[pb->win.norm][SAA7196_IOCC] &
-                                          ~7) | 3), pb);
-                                break;
-                        case 1: /* SVHS         */
-                                saa_set (SAA7196_IOCC,
-                                        ((saa_regs[pb->win.norm][SAA7196_IOCC] &
-                                          ~7) | 4), pb);
-                                break;
-                        default:
-                                return -EINVAL;
-                                break;
-                        }
-
-                        return 0;
-                }
-                case VIDIOCGPICT:
-                {
-                        struct video_picture vp = pb->picture;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGPICT\n");
-
-                        switch(pb->win.color_fmt) {
-                        case PLANB_GRAY:
-                                vp.palette = VIDEO_PALETTE_GREY;
-                        case PLANB_COLOUR15:
-                                vp.palette = VIDEO_PALETTE_RGB555;
-                                break;
-                        case PLANB_COLOUR32:
-                                vp.palette = VIDEO_PALETTE_RGB32;
-                                break;
-                        default:
-                                vp.palette = 0;
-                                break;
-                        }
-
-                        if(copy_to_user(arg,&vp,sizeof(vp)))
-                                return -EFAULT;
-                        return 0;
-                }
-                case VIDIOCSPICT:
-                {
-                        struct video_picture vp;
-
-                        DEBUG("PlanB: IOCTL VIDIOCSPICT\n");
-
-                        if(copy_from_user(&vp,arg,sizeof(vp)))
-                                return -EFAULT;
-                        pb->picture = vp;
-                        /* Should we do sanity checks here? */
-                        saa_set (SAA7196_BRIG, (unsigned char)
-                            ((pb->picture.brightness) >> 8), pb);
-                        saa_set (SAA7196_HUEC, (unsigned char)
-                            ((pb->picture.hue) >> 8) ^ 0x80, pb);
-                        saa_set (SAA7196_CSAT, (unsigned char)
-                            ((pb->picture.colour) >> 9), pb);
-                        saa_set (SAA7196_CONT, (unsigned char)
-                            ((pb->picture.contrast) >> 9), pb);
-
-                        return 0;
-                }
-                case VIDIOCSWIN:
-                {
-                        struct video_window     vw;
-                        struct video_clip       clip;
-                        int                     i;
-
-                        DEBUG("PlanB: IOCTL VIDIOCSWIN\n");
-
-                        if(copy_from_user(&vw,arg,sizeof(vw)))
-                                return -EFAULT;
-
-                        planb_lock(pb);
-                        /* Stop overlay if running */
-                        suspend_overlay(pb);
-                        pb->win.interlace = (vw.height > pb->maxlines/2)? 1: 0;
-                        if (pb->win.x != vw.x ||
-                            pb->win.y != vw.y ||
-                            pb->win.width != vw.width ||
-                            pb->win.height != vw.height ||
-                            !pb->cmd_buff_inited) {
-                                pb->win.x = vw.x;
-                                pb->win.y = vw.y;
-                                pb->win.width = vw.width;
-                                pb->win.height = vw.height;
-                                fill_cmd_buff(pb);
-                        }
-                        /* Reset clip mask */
-                        memset ((void *) pb->mask, 0xff, (pb->maxlines
-                                        * ((PLANB_MAXPIXELS + 7) & ~7)) / 8);
-                        /* Add any clip rects */
-                        for (i = 0; i < vw.clipcount; i++) {
-                                if (copy_from_user(&clip, vw.clips + i,
-                                                sizeof(struct video_clip)))
-                                        return -EFAULT;
-                                add_clip(pb, &clip);
-                        }
-                        /* restart overlay if it was running */
-                        resume_overlay(pb);
-                        planb_unlock(pb);
-                        return 0;
-                }
-                case VIDIOCGWIN:
-                {
-                        struct video_window vw;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGWIN\n");
-
-                        vw.x=pb->win.x;
-                        vw.y=pb->win.y;
-                        vw.width=pb->win.width;
-                        vw.height=pb->win.height;
-                        vw.chromakey=0;
-                        vw.flags=0;
-                        if(pb->win.interlace)
-                                vw.flags|=VIDEO_WINDOW_INTERLACE;
-                        if(copy_to_user(arg,&vw,sizeof(vw)))
-                                return -EFAULT;
-                        return 0;
-                }
-                case VIDIOCSYNC: {
-                        int i;
-
-                        IDEBUG("PlanB: IOCTL VIDIOCSYNC\n");
-
-                        if(copy_from_user((void *)&i,arg,sizeof(int)))
-                                return -EFAULT;
-
-                        IDEBUG("PlanB: sync to frame %d\n", i);
-
-                        if(i > (MAX_GBUFFERS - 1) || i < 0)
-                                return -EINVAL;
-chk_grab:
-                        switch (pb->frame_stat[i]) {
-                        case GBUFFER_UNUSED:
-                                return -EINVAL;
-                        case GBUFFER_GRABBING:
-                                IDEBUG("PlanB: waiting for grab"
-                                                        " done (%d)\n", i);
-                                interruptible_sleep_on(&pb->capq);
-                                if(signal_pending(current))
-                                        return -EINTR;
-                                goto chk_grab;
-                        case GBUFFER_DONE:
-                                pb->frame_stat[i] = GBUFFER_UNUSED;
-                                break;
-                        }
-                        return 0;
-                }
-
-                case VIDIOCMCAPTURE:
-                {
-                        struct video_mmap vm;
-                        volatile unsigned int status;
-
-                        IDEBUG("PlanB: IOCTL VIDIOCMCAPTURE\n");
-
-                        if(copy_from_user((void *) &vm,(void *)arg,sizeof(vm)))
-                                return -EFAULT;
-                        status = pb->frame_stat[vm.frame];
-                        if (status != GBUFFER_UNUSED)
-                                return -EBUSY;
-
-                        return vgrab(pb, &vm);
-                }
-
-                case VIDIOCGMBUF:
-                {
-                        int i;
-                        struct video_mbuf vm;
-
-                        DEBUG("PlanB: IOCTL VIDIOCGMBUF\n");
-
-                        memset(&vm, 0 , sizeof(vm));
-                        vm.size = PLANB_MAX_FBUF * MAX_GBUFFERS;
-                        vm.frames = MAX_GBUFFERS;
-                        for(i = 0; i<MAX_GBUFFERS; i++)
-                                vm.offsets[i] = PLANB_MAX_FBUF * i;
-                        if(copy_to_user((void *)arg, (void *)&vm, sizeof(vm)))
-                                return -EFAULT;
-                        return 0;
-                }
-
-                case PLANBIOCGSAAREGS:
-                {
-                        struct planb_saa_regs preg;
-
-                        DEBUG("PlanB: IOCTL PLANBIOCGSAAREGS\n");
-
-                        if(copy_from_user(&preg, arg, sizeof(preg)))
-                                return -EFAULT;
-                        if(preg.addr >= SAA7196_NUMREGS)
-                                return -EINVAL;
-                        preg.val = saa_regs[pb->win.norm][preg.addr];
-                        if(copy_to_user((void *)arg, (void *)&preg,
-                                                                sizeof(preg)))
-                                return -EFAULT;
-                        return 0;
-                }
-
-                case PLANBIOCSSAAREGS:
-                {
-                        struct planb_saa_regs preg;
-
-                        DEBUG("PlanB: IOCTL PLANBIOCSSAAREGS\n");
-
-                        if(copy_from_user(&preg, arg, sizeof(preg)))
-                                return -EFAULT;
-                        if(preg.addr >= SAA7196_NUMREGS)
-                                return -EINVAL;
-                        saa_set (preg.addr, preg.val, pb);
-                        return 0;
-                }
-
-                case PLANBIOCGSTAT:
-                {
-                        struct planb_stat_regs pstat;
-
-                        DEBUG("PlanB: IOCTL PLANBIOCGSTAT\n");
-
-                        pstat.ch1_stat = in_le32(&pb->planb_base->ch1.status);
-                        pstat.ch2_stat = in_le32(&pb->planb_base->ch2.status);
-                        pstat.saa_stat0 = saa_status(0, pb);
-                        pstat.saa_stat1 = saa_status(1, pb);
-
-                        if(copy_to_user((void *)arg, (void *)&pstat,
-                                                        sizeof(pstat)))
-                                return -EFAULT;
-                        return 0;
-                }
-
-                case PLANBIOCSMODE: {
-                        int v;
-
-                        DEBUG("PlanB: IOCTL PLANBIOCSMODE\n");
-
-                        if(copy_from_user(&v, arg, sizeof(v)))
-                                return -EFAULT;
-
-                        switch(v)
-                        {
-                        case PLANB_TV_MODE:
-                                saa_set (SAA7196_STDC,
-                                        (saa_regs[pb->win.norm][SAA7196_STDC] &
-                                          0x7f), pb);
-                                break;
-                        case PLANB_VTR_MODE:
-                                saa_set (SAA7196_STDC,
-                                        (saa_regs[pb->win.norm][SAA7196_STDC] |
-                                          0x80), pb);
-                                break;
-                        default:
-                                return -EINVAL;
-                                break;
-                        }
-                        pb->win.mode = v;
-                        return 0;
-                }
-                case PLANBIOCGMODE: {
-                        int v=pb->win.mode;
-
-                        DEBUG("PlanB: IOCTL PLANBIOCGMODE\n");
-
-                        if(copy_to_user(arg,&v,sizeof(v)))
-                                return -EFAULT;
-                        return 0;
-                }
-#ifdef PLANB_GSCANLINE
-                case PLANBG_GRAB_BPL: {
-                        int v=pb->gbytes_per_line;
-
-                        DEBUG("PlanB: IOCTL PLANBG_GRAB_BPL\n");
-
-                        if(copy_to_user(arg,&v,sizeof(v)))
-                                return -EFAULT;
-                        return 0;
-                }
-#endif /* PLANB_GSCANLINE */
-                case PLANB_INTR_DEBUG: {
-                        int i;
-
-                        DEBUG("PlanB: IOCTL PLANB_INTR_DEBUG\n");
-
-                        if(copy_from_user(&i, arg, sizeof(i)))
-                                return -EFAULT;
-
-                        /* avoid hang ups all together */
-                        for (i = 0; i < MAX_GBUFFERS; i++) {
-                                if(pb->frame_stat[i] == GBUFFER_GRABBING) {
-                                        pb->frame_stat[i] = GBUFFER_DONE;
-                                }
-                        }
-                        if(pb->grabbing)
-                                pb->grabbing--;
-                        wake_up_interruptible(&pb->capq);
-                        return 0;
-                }
-                case PLANB_INV_REGS: {
-                        int i;
-                        struct planb_any_regs any;
-
-                        DEBUG("PlanB: IOCTL PLANB_INV_REGS\n");
-
-                        if(copy_from_user(&any, arg, sizeof(any)))
-                                return -EFAULT;
-                        if(any.offset < 0 || any.offset + any.bytes > 0x400)
-                                return -EINVAL;
-                        if(any.bytes > 128)
-                                return -EINVAL;
-                        for (i = 0; i < any.bytes; i++) {
-                                any.data[i] =
-                                        in_8((unsigned char *)pb->planb_base
-                                                        + any.offset + i);
-                        }
-                        if(copy_to_user(arg,&any,sizeof(any)))
-                                return -EFAULT;
-                        return 0;
-                }
-                default:
-                {
-                        DEBUG("PlanB: Unimplemented IOCTL\n");
-                        return -ENOIOCTLCMD;
-                }
-        /* Some IOCTLs are currently unsupported on PlanB */
-                case VIDIOCGTUNER: {
-                DEBUG("PlanB: IOCTL VIDIOCGTUNER\n");
-                        goto unimplemented; }
-                case VIDIOCSTUNER: {
-                DEBUG("PlanB: IOCTL VIDIOCSTUNER\n");
-                        goto unimplemented; }
-                case VIDIOCSFREQ: {
-                DEBUG("PlanB: IOCTL VIDIOCSFREQ\n");
-                        goto unimplemented; }
-                case VIDIOCGFREQ: {
-                DEBUG("PlanB: IOCTL VIDIOCGFREQ\n");
-                        goto unimplemented; }
-                case VIDIOCKEY: {
-                DEBUG("PlanB: IOCTL VIDIOCKEY\n");
-                        goto unimplemented; }
-                case VIDIOCSAUDIO: {
-                DEBUG("PlanB: IOCTL VIDIOCSAUDIO\n");
-                        goto unimplemented; }
-                case VIDIOCGAUDIO: {
-                DEBUG("PlanB: IOCTL VIDIOCGAUDIO\n");
-                        goto unimplemented; }
-unimplemented:
-                DEBUG("       Unimplemented\n");
-                        return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static int planb_mmap(struct vm_area_struct *vma, struct video_device *dev, const char *adr, unsigned long size)
-{
-        int i;
-        struct planb *pb = (struct planb *)dev;
-        unsigned long start = (unsigned long)adr;
-
-        if (size > MAX_GBUFFERS * PLANB_MAX_FBUF)
-                return -EINVAL;
-        if (!pb->rawbuf) {
-                int err;
-                if((err=grabbuf_alloc(pb)))
-                        return err;
-        }
-        for (i = 0; i < pb->rawbuf_size; i++) {
-                unsigned long pfn;
-
-                pfn = virt_to_phys((void *)pb->rawbuf[i]) >> PAGE_SHIFT;
-                if (remap_pfn_range(vma, start, pfn, PAGE_SIZE, PAGE_SHARED))
-                        return -EAGAIN;
-                start += PAGE_SIZE;
-                if (size <= PAGE_SIZE)
-                        break;
-                size -= PAGE_SIZE;
-        }
-        return 0;
-}
-
-static struct video_device planb_template=
-{
-        .owner          = THIS_MODULE,
-        .name           = PLANB_DEVICE_NAME,
-        .type           = VID_TYPE_OVERLAY,
-        .open           = planb_open,
-        .close          = planb_close,
-        .read           = planb_read,
-        .write          = planb_write,
-        .ioctl          = planb_ioctl,
-        .mmap           = planb_mmap,   /* mmap? */
-};
-
-static int init_planb(struct planb *pb)
-{
-        unsigned char saa_rev;
-        int i, result;
-
-        memset ((void *) &pb->win, 0, sizeof (struct planb_window));
-        /* Simple sanity check */
-        if(def_norm >= NUM_SUPPORTED_NORM || def_norm < 0) {
-                printk(KERN_ERR "PlanB: Option(s) invalid\n");
-                return -2;
-        }
-        pb->win.norm = def_norm;
-        pb->win.mode = PLANB_TV_MODE;   /* TV mode */
-        pb->win.interlace=1;
-        pb->win.x=0;
-        pb->win.y=0;
-        pb->win.width=768; /* 640 */
-        pb->win.height=576; /* 480 */
-        pb->maxlines=576;
-#if 0
-        btv->win.cropwidth=768; /* 640 */
-        btv->win.cropheight=576; /* 480 */
-        btv->win.cropx=0;
-        btv->win.cropy=0;
-#endif
-        pb->win.pad=0;
-        pb->win.bpp=4;
-        pb->win.depth=32;
-        pb->win.color_fmt=PLANB_COLOUR32;
-        pb->win.bpl=1024*pb->win.bpp;
-        pb->win.swidth=1024;
-        pb->win.sheight=768;
-#ifdef PLANB_GSCANLINE
-        if((pb->gbytes_per_line = PLANB_MAXPIXELS * 4) > PAGE_SIZE
-                                || (pb->gbytes_per_line <= 0))
-                return -3;
-        else {
-                /* page align pb->gbytes_per_line for DMA purpose */
-                for(i = PAGE_SIZE; pb->gbytes_per_line < (i>>1);)
-                        i>>=1;
-                pb->gbytes_per_line = i;
-        }
-#endif
-        pb->tab_size = PLANB_MAXLINES + 40;
-        pb->suspend = 0;
-        mutex_init(&pb->lock);
-        pb->ch1_cmd = 0;
-        pb->ch2_cmd = 0;
-        pb->mask = 0;
-        pb->priv_space = 0;
-        pb->offset = 0;
-        pb->user = 0;
-        pb->overlay = 0;
-        init_waitqueue_head(&pb->suspendq);
-        pb->cmd_buff_inited = 0;
-        pb->frame_buffer_phys = 0;
-
-        /* Reset DMA controllers */
-        planb_dbdma_stop(&pb->planb_base->ch2);
-        planb_dbdma_stop(&pb->planb_base->ch1);
-
-        saa_rev =  (saa_status(0, pb) & 0xf0) >> 4;
-        printk(KERN_INFO "PlanB: SAA7196 video processor rev. %d\n", saa_rev);
-        /* Initialize the SAA registers in memory and on chip */
-        saa_init_regs (pb);
-
-        /* clear interrupt mask */
-        pb->intr_mask = PLANB_CLR_IRQ;
-
-        result = request_irq(pb->irq, planb_irq, 0, "PlanB", pb);
-        if (result < 0) {
-                if (result==-EINVAL)
-                        printk(KERN_ERR "PlanB: Bad irq number (%d) "
-                                                "or handler\n", (int)pb->irq);
-                else if (result==-EBUSY)
-                        printk(KERN_ERR "PlanB: I don't know why, "
-                                        "but IRQ %d is busy\n", (int)pb->irq);
-                return result;
-        }
-        disable_irq(pb->irq);
-
-        /* Now add the template and register the device unit. */
-        memcpy(&pb->video_dev,&planb_template,sizeof(planb_template));
-
-        pb->picture.brightness=0x90<<8;
-        pb->picture.contrast = 0x70 << 8;
-        pb->picture.colour = 0x70<<8;
-        pb->picture.hue = 0x8000;
-        pb->picture.whiteness = 0;
-        pb->picture.depth = pb->win.depth;
-
-        pb->frame_stat=NULL;
-        init_waitqueue_head(&pb->capq);
-        for(i=0; i<MAX_GBUFFERS; i++) {
-                pb->gbuf_idx[i] = PLANB_MAX_FBUF * i / PAGE_SIZE;
-                pb->gwidth[i]=0;
-                pb->gheight[i]=0;
-                pb->gfmt[i]=0;
-                pb->cap_cmd[i]=NULL;
-#ifndef PLANB_GSCANLINE
-                pb->l_fr_addr_idx[i] = MAX_GBUFFERS * (PLANB_MAX_FBUF
-                                                / PAGE_SIZE + 1) + MAX_LNUM * i;
-                pb->lsize[i] = 0;
-                pb->lnum[i] = 0;
-#endif
-        }
-        pb->rawbuf=NULL;
-        pb->grabbing=0;
-
-        /* enable interrupts */
-        out_le32(&pb->planb_base->intr_stat, PLANB_CLR_IRQ);
-        pb->intr_mask = PLANB_FRM_IRQ;
-        enable_irq(pb->irq);
-
-        if(video_register_device(&pb->video_dev, VFL_TYPE_GRABBER, video_nr)<0)
-                return -1;
-
-        return 0;
-}
-
-/*
- *      Scan for a PlanB controller, request the irq and map the io memory
- */
-
-static int find_planb(void)
-{
-        struct planb            *pb;
-        struct device_node      *planb_devices;
-        unsigned char           dev_fn, confreg, bus;
-        unsigned int            old_base, new_base;
-        unsigned int            irq;
-        struct pci_dev          *pdev;
-        int rc;
-
-        if (!machine_is(powermac))
-                return 0;
-
-        planb_devices = of_find_node_by_name(NULL, "planb");
-        if (planb_devices == 0) {
-                planb_num=0;
-                printk(KERN_WARNING "PlanB: no device found!\n");
-                return planb_num;
-        }
-
-        if (planb_devices->next != NULL)
-                printk(KERN_ERR "Warning: only using first PlanB device!\n");
-        pb = &planbs[0];
-        planb_num = 1;
-
-        if (planb_devices->n_addrs != 1) {
-                printk (KERN_WARNING "PlanB: expecting 1 address for planb "
-                        "(got %d)", planb_devices->n_addrs);
-                of_node_put(planb_devices);
-                return 0;
-        }
-
-        if (planb_devices->n_intrs == 0) {
-                printk(KERN_WARNING "PlanB: no intrs for device %s\n",
-                       planb_devices->full_name);
-                of_node_put(planb_devices);
-                return 0;
-        } else {
-                irq = planb_devices->intrs[0].line;
-        }
-
-        /* Initialize PlanB's PCI registers */
-
-        /* There is a bug with the way OF assigns addresses
-           to the devices behind the chaos bridge.
-           control needs only 0x1000 of space, but decodes only
-           the upper 16 bits. It therefore occupies a full 64K.
-           OF assigns the planb controller memory within this space;
-           so we need to change that here in order to access planb. */
-
-        /* We remap to 0xf1000000 in hope that nobody uses it ! */
-
-        bus = (planb_devices->addrs[0].space >> 16) & 0xff;
-        dev_fn = (planb_devices->addrs[0].space >> 8) & 0xff;
-        confreg = planb_devices->addrs[0].space & 0xff;
-        old_base = planb_devices->addrs[0].address;
-        new_base = 0xf1000000;
-        of_node_put(planb_devices);
-
-        DEBUG("PlanB: Found on bus %d, dev %d, func %d, "
-                "membase 0x%x (base reg. 0x%x)\n",
-                bus, PCI_SLOT(dev_fn), PCI_FUNC(dev_fn), old_base, confreg);
-
-        pdev = pci_get_bus_and_slot(bus, dev_fn);
-        if (!pdev) {
-                printk(KERN_ERR "planb: cannot find slot\n");
-                goto err_out;
-        }
-
-        /* Enable response in memory space, bus mastering,
-           use memory write and invalidate */
-        rc = pci_enable_device(pdev);
-        if (rc) {
-                printk(KERN_ERR "planb: cannot enable PCI device %s\n",
-                       pci_name(pdev));
-                goto err_out;
-        }
-        rc = pci_set_mwi(pdev);
-        if (rc) {
-                printk(KERN_ERR "planb: cannot enable MWI on PCI device %s\n",
-                       pci_name(pdev));
-                goto err_out_disable;
-        }
-        pci_set_master(pdev);
-
-        /* Set the new base address */
-        pci_write_config_dword (pdev, confreg, new_base);
-
-        planb_regs = (volatile struct planb_registers *)
-                                                ioremap (new_base, 0x400);
-        pb->planb_base = planb_regs;
-        pb->planb_base_phys = (struct planb_registers *)new_base;
-        pb->irq = irq;
-        pb->dev = pdev;
-
-        return planb_num;
-
-err_out_disable:
-        pci_disable_device(pdev);
-err_out:
-        /* FIXME handle error */   /* comment moved from pci_find_slot, above */
-        pci_dev_put(pdev);
-        return 0;
-}
-
-static void release_planb(void)
-{
-        int i;
-        struct planb *pb;
-
-        for (i=0;i<planb_num; i++)
-        {
-                pb=&planbs[i];
-
-                /* stop and flash DMAs unconditionally */
-                planb_dbdma_stop(&pb->planb_base->ch2);
-                planb_dbdma_stop(&pb->planb_base->ch1);
-
-                /* clear and free interrupts */
-                pb->intr_mask = PLANB_CLR_IRQ;
-                out_le32 (&pb->planb_base->intr_stat, PLANB_CLR_IRQ);
-                free_irq(pb->irq, pb);
-
-                /* make sure all allocated memory are freed */
-                planb_prepare_close(pb);
-
-                printk(KERN_INFO "PlanB: unregistering with v4l\n");
-                video_unregister_device(&pb->video_dev);
-
-                pci_dev_put(pb->dev);
-
-                /* note that iounmap() does nothing on the PPC right now */
-                iounmap ((void *)pb->planb_base);
-        }
-}
-
-static int __init init_planbs(void)
-{
-        int i;
-
-        if (find_planb()<=0)
-                return -EIO;
-
-        for (i=0; i<planb_num; i++) {
-                if (init_planb(&planbs[i])<0) {
-                        printk(KERN_ERR "PlanB: error registering device %d"
-                                                        " with v4l\n", i);
-                        release_planb();
-                        return -EIO;
-                }
-                printk(KERN_INFO "PlanB: registered device %d with v4l\n", i);
-        }
-        return 0;
-}
-
-static void __exit exit_planbs(void)
-{
-        release_planb();
-}
-
-module_init(init_planbs);
-module_exit(exit_planbs);
diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
index e21b5735c103..e69de29bb2d1 100644
--- a/drivers/media/video/planb.h
+++ b/drivers/media/video/planb.h
@@ -1,232 +0,0 @@
-/*
-    planb - PlanB frame grabber driver
-
-    PlanB is used in the 7x00/8x00 series of PowerMacintosh
-    Computers as video input DMA controller.
-
-    Copyright (C) 1998 Michel Lanners (mlan@cpu.lu)
-
-    Based largely on the bttv driver by Ralph Metzler (rjkm@thp.uni-koeln.de)
-
-    Additional debugging and coding by Takashi Oe (toe@unlserve.unl.edu)
-
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* $Id: planb.h,v 1.13 1999/05/03 19:28:56 mlan Exp $ */
-
-#ifndef _PLANB_H_
-#define _PLANB_H_
-
-#ifdef __KERNEL__
-#include <asm/dbdma.h>
-#include "saa7196.h"
-#endif /* __KERNEL__ */
-
-#define PLANB_DEVICE_NAME       "Apple PlanB Video-In"
-#define PLANB_REV               "1.0"
-
-#ifdef __KERNEL__
-//#define PLANB_GSCANLINE       /* use this if apps have the notion of */
-                                /* grab buffer scanline */
-/* This should be safe for both PAL and NTSC */
-#define PLANB_MAXPIXELS 768
-#define PLANB_MAXLINES 576
-#define PLANB_NTSC_MAXLINES 480
-
-/* Uncomment your preferred norm ;-) */
-#define PLANB_DEF_NORM VIDEO_MODE_PAL
-//#define PLANB_DEF_NORM VIDEO_MODE_NTSC
-//#define PLANB_DEF_NORM VIDEO_MODE_SECAM
-
-/* fields settings */
-#define PLANB_GRAY      0x1     /*  8-bit mono? */
-#define PLANB_COLOUR15  0x2     /* 16-bit mode */
-#define PLANB_COLOUR32  0x4     /* 32-bit mode */
-#define PLANB_CLIPMASK  0x8     /* hardware clipmasking */
-
-/* misc. flags for PlanB DMA operation */
-#define CH_SYNC         0x1     /* synchronize channels (set by ch1;
-                                   cleared by ch2) */
-#define FIELD_SYNC      0x2     /* used for the start of each field
-                                   (0 -> 1 -> 0 for ch1; 0 -> 1 for ch2) */
-#define EVEN_FIELD      0x0     /* even field is detected if unset */
-#define DMA_ABORT       0x2     /* error or just out of sync if set */
-#define ODD_FIELD       0x4     /* odd field is detected if set */
-
-/* for capture operations */
-#define MAX_GBUFFERS    2
-/* note PLANB_MAX_FBUF must be divisible by PAGE_SIZE */
-#ifdef PLANB_GSCANLINE
-#define PLANB_MAX_FBUF  0x240000        /* 576 * 1024 * 4 */
-#define TAB_FACTOR      (1)
-#else
-#define PLANB_MAX_FBUF  0x1b0000        /* 576 * 768 * 4 */
-#define TAB_FACTOR      (2)
-#endif
-#endif /* __KERNEL__ */
-
-struct planb_saa_regs {
-        unsigned char addr;
-        unsigned char val;
-};
-
-struct planb_stat_regs {
-        unsigned int ch1_stat;
-        unsigned int ch2_stat;
-        unsigned char saa_stat0;
-        unsigned char saa_stat1;
-};
-
-struct planb_any_regs {
-        unsigned int offset;
-        unsigned int bytes;
-        unsigned char data[128];
-};
-
-/* planb private ioctls */
-#define PLANBIOCGSAAREGS        _IOWR('v', BASE_VIDIOCPRIVATE, struct planb_saa_regs)   /* Read a saa7196 reg value */
-#define PLANBIOCSSAAREGS        _IOW('v', BASE_VIDIOCPRIVATE + 1, struct planb_saa_regs)        /* Set a saa7196 reg value */
-#define PLANBIOCGSTAT           _IOR('v', BASE_VIDIOCPRIVATE + 2, struct planb_stat_regs)       /* Read planb status */
-#define PLANB_TV_MODE           1
-#define PLANB_VTR_MODE          2
-#define PLANBIOCGMODE           _IOR('v', BASE_VIDIOCPRIVATE + 3, int)  /* Get TV/VTR mode */
-#define PLANBIOCSMODE           _IOW('v', BASE_VIDIOCPRIVATE + 4, int)  /* Set TV/VTR mode */
-
-#ifdef PLANB_GSCANLINE
-#define PLANBG_GRAB_BPL         _IOR('v', BASE_VIDIOCPRIVATE + 5, int)  /* # of bytes per scanline in grab buffer */
-#endif
-
-/* call wake_up_interruptible() with appropriate actions */
-#define PLANB_INTR_DEBUG        _IOW('v', BASE_VIDIOCPRIVATE + 20, int)
-/* investigate which reg does what */
-#define PLANB_INV_REGS          _IOWR('v', BASE_VIDIOCPRIVATE + 21, struct planb_any_regs)
-
-#ifdef __KERNEL__
-
-/* Potentially useful macros */
-#define PLANB_SET(x)    ((x) << 16 | (x))
-#define PLANB_CLR(x)    ((x) << 16)
-
-/* This represents the physical register layout */
-struct planb_registers {
-        volatile struct dbdma_regs      ch1;            /* 0x00: video in */
-        volatile unsigned int           even;           /* 0x40: even field setting */
-        volatile unsigned int           odd;            /* 0x44; odd field setting */
-        unsigned int                    pad1[14];       /* empty? */
-        volatile struct dbdma_regs      ch2;            /* 0x80: clipmask out */
-        unsigned int                    pad2[16];       /* 0xc0: empty? */
-        volatile unsigned int           reg3;           /* 0x100: ???? */
-        volatile unsigned int           intr_stat;      /* 0x104: irq status */
-#define PLANB_CLR_IRQ           0x00            /* clear Plan B interrupt */
-#define PLANB_GEN_IRQ           0x01            /* assert Plan B interrupt */
-#define PLANB_FRM_IRQ           0x0100          /* end of frame */
-        unsigned int                    pad3[1];        /* empty? */
-        volatile unsigned int           reg5;           /* 0x10c: ??? */
-        unsigned int                    pad4[60];       /* empty? */
-        volatile unsigned char          saa_addr;       /* 0x200: SAA subadr */
-        char                            pad5[3];
-        volatile unsigned char          saa_regval;     /* SAA7196 write reg. val */
-        char                            pad6[3];
-        volatile unsigned char          saa_status;     /* SAA7196 status byte */
-        /* There is more unused stuff here */
-};
-
-struct planb_window {
-        int     x, y;
-        ushort  width, height;
-        ushort  bpp, bpl, depth, pad;
-        ushort  swidth, sheight;
-        int     norm;
-        int     interlace;
-        u32     color_fmt;
-        int     chromakey;
-        int     mode;           /* used to switch between TV/VTR modes */
-};
-
-struct planb_suspend {
-        int overlay;
-        int frame;
-        struct dbdma_cmd cmd;
-};
-
-struct planb {
-        struct  video_device video_dev;
-        struct  video_picture picture;          /* Current picture params */
-        struct  video_audio audio_dev;          /* Current audio params */
-
-        volatile struct planb_registers *planb_base;    /* virt base of planb */
-        struct planb_registers *planb_base_phys;        /* phys base of planb */
-        void    *priv_space;                    /* Org. alloc. mem for kfree */
-        int     user;
-        unsigned int tab_size;
-        int     maxlines;
-        struct mutex lock;
-        unsigned int    irq;                    /* interrupt number */
-        volatile unsigned int intr_mask;
-        struct pci_dev *dev;                    /* Our PCI device */
-
-        int     overlay;                        /* overlay running? */
-        struct  planb_window win;
-        unsigned long frame_buffer_phys;        /* We need phys for DMA */
-        int     offset;                         /* offset of pixel 1 */
-        volatile struct dbdma_cmd *ch1_cmd;     /* Video In DMA cmd buffer */
-        volatile struct dbdma_cmd *ch2_cmd;     /* Clip Out DMA cmd buffer */
-        volatile struct dbdma_cmd *overlay_last1;
-        volatile struct dbdma_cmd *overlay_last2;
-        unsigned long ch1_cmd_phys;
-        volatile unsigned char *mask;           /* Clipmask buffer */
-        int suspend;
-        wait_queue_head_t suspendq;
-        struct planb_suspend suspended;
-        int     cmd_buff_inited;                /* cmd buffer inited? */
-
-        int grabbing;
-        unsigned int gcount;
-        wait_queue_head_t capq;
-        int last_fr;
-        int prev_last_fr;
-        unsigned char **rawbuf;
-        int rawbuf_size;
-        int gbuf_idx[MAX_GBUFFERS];
-        volatile struct dbdma_cmd *cap_cmd[MAX_GBUFFERS];
-        volatile struct dbdma_cmd *last_cmd[MAX_GBUFFERS];
-        volatile struct dbdma_cmd *pre_cmd[MAX_GBUFFERS];
-        int need_pre_capture[MAX_GBUFFERS];
-#define PLANB_DUMMY 40  /* # of command buf's allocated for pre-capture seq. */
-        int gwidth[MAX_GBUFFERS], gheight[MAX_GBUFFERS];
-        unsigned int gfmt[MAX_GBUFFERS];
-        int gnorm_switch[MAX_GBUFFERS];
-        volatile unsigned int *frame_stat;
-#define GBUFFER_UNUSED       0x00U
-#define GBUFFER_GRABBING     0x01U
-#define GBUFFER_DONE         0x02U
-#ifdef PLANB_GSCANLINE
-        int gbytes_per_line;
-#else
-#define MAX_LNUM 431    /* change this if PLANB_MAXLINES or */
-                        /* PLANB_MAXPIXELS changes */
-        int l_fr_addr_idx[MAX_GBUFFERS];
-        unsigned char *l_to_addr[MAX_GBUFFERS][MAX_LNUM];
-        int l_to_next_idx[MAX_GBUFFERS][MAX_LNUM];
-        int l_to_next_size[MAX_GBUFFERS][MAX_LNUM];
-        int lsize[MAX_GBUFFERS], lnum[MAX_GBUFFERS];
-#endif
-};
-
-#endif /* __KERNEL__ */
-
-#endif /* _PLANB_H_ */
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 51b1461d8fb6..00425d743656 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 #include <asm/uaccess.h>
@@ -894,9 +895,7 @@ static const struct file_operations pms_fops = {
 
 static struct video_device pms_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Mediavision PMS",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &pms_fops,
 };
 
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 4482b2c72ced..19eb274c9cd0 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -2,8 +2,6 @@ config VIDEO_PVRUSB2
         tristate "Hauppauge WinTV-PVR USB2 support"
         depends on VIDEO_V4L2 && I2C
         depends on VIDEO_MEDIA  # Avoids pvrusb = Y / DVB = M
-        depends on HOTPLUG      # due to FW_LOADER
-        select FW_LOADER
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.h b/drivers/media/video/pvrusb2/pvrusb2-context.h
index 61801291c2af..d657e53bbfa3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef __PVRUSB2_BASE_H
-#define __PVRUSB2_BASE_H
+#ifndef __PVRUSB2_CONTEXT_H
+#define __PVRUSB2_CONTEXT_H
 
 #include <linux/mutex.h>
 #include <linux/usb.h>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 5d036e7e3f07..88e175168438 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -97,13 +97,13 @@ static const struct pvr2_device_desc pvr2_device_24xxx = {
                 .flag_has_cx25840 = !0,
                 .flag_has_wm8775 = !0,
                 .flag_has_hauppauge_rom = !0,
-                .flag_has_hauppauge_custom_ir = !0,
                 .flag_has_analogtuner = !0,
                 .flag_has_fmradio = !0,
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+                .ir_scheme = PVR2_IR_SCHEME_24XXX,
 };
 
 
@@ -330,7 +330,7 @@ static const char *pvr2_fw1_names_73xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_73xxx = {
-                .description = "WinTV PVR USB2 Model Category 73xxx",
+                .description = "WinTV HVR-1900 Model Category 73xxx",
                 .shortname = "73xxx",
                 .client_modules.lst = pvr2_client_73xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
@@ -344,6 +344,7 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+                .ir_scheme = PVR2_IR_SCHEME_ZILOG,
 #ifdef CONFIG_VIDEO_PVRUSB2_DVB
                 .dvb_props = &pvr2_73xxx_dvb_props,
 #endif
@@ -438,7 +439,7 @@ static const char *pvr2_fw1_names_75xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_750xx = {
-                .description = "WinTV PVR USB2 Model Category 750xx",
+                .description = "WinTV HVR-1950 Model Category 750xx",
                 .shortname = "750xx",
                 .client_modules.lst = pvr2_client_75xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
@@ -453,13 +454,14 @@ static const struct pvr2_device_desc pvr2_device_750xx = {
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .default_std_mask = V4L2_STD_NTSC_M,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+                .ir_scheme = PVR2_IR_SCHEME_ZILOG,
 #ifdef CONFIG_VIDEO_PVRUSB2_DVB
                 .dvb_props = &pvr2_750xx_dvb_props,
 #endif
 };
 
 static const struct pvr2_device_desc pvr2_device_751xx = {
-                .description = "WinTV PVR USB2 Model Category 751xx",
+                .description = "WinTV HVR-1950 Model Category 751xx",
                 .shortname = "751xx",
                 .client_modules.lst = pvr2_client_75xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
@@ -474,6 +476,7 @@ static const struct pvr2_device_desc pvr2_device_751xx = {
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .default_std_mask = V4L2_STD_NTSC_M,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+                .ir_scheme = PVR2_IR_SCHEME_ZILOG,
 #ifdef CONFIG_VIDEO_PVRUSB2_DVB
                 .dvb_props = &pvr2_751xx_dvb_props,
 #endif
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index e23ce1d2edd7..cb3a33eb0276 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -48,6 +48,10 @@ struct pvr2_string_table {
 #define PVR2_LED_SCHEME_NONE 0
 #define PVR2_LED_SCHEME_HAUPPAUGE 1
 
+#define PVR2_IR_SCHEME_NONE 0
+#define PVR2_IR_SCHEME_24XXX 1
+#define PVR2_IR_SCHEME_ZILOG 2
+
 /* This describes a particular hardware type (except for the USB device ID
    which must live in a separate structure due to environmental
    constraints).  See the top of pvrusb2-hdw.c for where this is
@@ -126,15 +130,19 @@ struct pvr2_device_desc {
            ensure that it is found. */
         unsigned int flag_has_wm8775:1;
 
-        /* Device has IR hardware that can be faked into looking like a
-           normal Hauppauge i2c IR receiver.  This is currently very
-           specific to the 24xxx device, where Hauppauge had replaced their
-           'standard' I2C IR receiver with a bunch of FPGA logic controlled
-           directly via the FX2.  Turning this on tells the pvrusb2 driver
-           to virtualize the presence of the non-existant IR receiver chip and
-           implement the virtual receiver in terms of appropriate FX2
-           commands. */
-        unsigned int flag_has_hauppauge_custom_ir:1;
+        /* Indicate any specialized IR scheme that might need to be
+           supported by this driver.  If not set, then it is assumed that
+           IR can work without help from the driver (which is frequently
+           the case).  This is otherwise set to one of
+           PVR2_IR_SCHEME_xxxx.  For "xxxx", the value "24XXX" indicates a
+           Hauppauge 24xxx class device which has an FPGA-hosted IR
+           receiver that can only be reached via FX2 command codes.  In
+           that case the pvrusb2 driver will emulate the behavior of the
+           older 29xxx device's IR receiver (a "virtual" I2C chip) in terms
+           of those command codes.  For the value "ZILOG", we're dealing
+           with an IR chip that must be taken out of reset via another FX2
+           command code (which is the case for HVR-1950 devices). */
+        unsigned int ir_scheme:2;
 
         /* These bits define which kinds of sources the device can handle.
            Note: Digital tuner presence is inferred by the
diff --git a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
index b58369e7f30b..614755ea2ea3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
@@ -24,6 +24,8 @@
 #define FX2CMD_MEM_WRITE_DWORD  0x01u
 #define FX2CMD_MEM_READ_DWORD   0x02u
 
+#define FX2CMD_HCW_ZILOG_RESET  0x10u /* 1=reset 0=release */
+
 #define FX2CMD_MEM_READ_64BYTES 0x28u
 
 #define FX2CMD_REG_WRITE        0x04u
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index a5217a2cf4c0..f051c6aa7f1f 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -250,6 +250,7 @@ struct pvr2_fx2cmd_descdef {
 static const struct pvr2_fx2cmd_descdef pvr2_fx2cmd_desc[] = {
         {FX2CMD_MEM_WRITE_DWORD, "write encoder dword"},
         {FX2CMD_MEM_READ_DWORD, "read encoder dword"},
+        {FX2CMD_HCW_ZILOG_RESET, "zilog IR reset control"},
         {FX2CMD_MEM_READ_64BYTES, "read encoder 64bytes"},
         {FX2CMD_REG_WRITE, "write encoder register"},
         {FX2CMD_REG_READ, "read encoder register"},
@@ -1711,6 +1712,14 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
                 if (!pvr2_hdw_dev_ok(hdw)) return;
         }
 
+        /* Take the IR chip out of reset, if appropriate */
+        if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_ZILOG) {
+                pvr2_issue_simple_cmd(hdw,
+                                      FX2CMD_HCW_ZILOG_RESET |
+                                      (1 << 8) |
+                                      ((0) << 16));
+        }
+
         // This step MUST happen after the earlier powerup step.
         pvr2_i2c_core_init(hdw);
         if (!pvr2_hdw_dev_ok(hdw)) return;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 9d3c18b24744..e600576a6c4b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -979,7 +979,9 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
                 printk(KERN_INFO "%s: IR disabled\n",hdw->name);
                 hdw->i2c_func[0x18] = i2c_black_hole;
         } else if (ir_mode[hdw->unit_number] == 1) {
-                if (hdw->hdw_desc->flag_has_hauppauge_custom_ir) {
+                if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_24XXX) {
+                        /* This comment is present PURELY to get
+                           checkpatch.pl to STFU.  Lovely, eh? */
                         hdw->i2c_func[0x18] = i2c_24xxx_ir;
                 }
         }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 0d72dc470fef..00306faeac01 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -30,6 +30,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 struct pvr2_v4l2_dev;
 struct pvr2_v4l2_fh;
@@ -1160,11 +1161,6 @@ static const struct file_operations vdev_fops = {
 
 
 static struct video_device vdev_template = {
-        .owner      = THIS_MODULE,
-        .type       = VID_TYPE_CAPTURE | VID_TYPE_TUNER,
-        .type2      = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE
-                       | V4L2_CAP_TUNER | V4L2_CAP_AUDIO
-                       | V4L2_CAP_READWRITE),
         .fops       = &vdev_fops,
 };
 
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 423fa7c2d0c9..9aee7cb6f79a 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -165,9 +165,7 @@ static const struct file_operations pwc_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device pwc_template = {
-        .owner =        THIS_MODULE,
         .name =         "Philips Webcam",       /* Filled in later */
-        .type =         VID_TYPE_CAPTURE,
         .release =      video_device_release,
         .fops =         &pwc_fops,
         .minor =        -1,
@@ -1048,19 +1046,20 @@ static int pwc_create_sysfs_files(struct video_device *vdev)
         struct pwc_device *pdev = video_get_drvdata(vdev);
         int rc;
 
-        rc = video_device_create_file(vdev, &dev_attr_button);
+        rc = device_create_file(&vdev->dev, &dev_attr_button);
         if (rc)
                 goto err;
         if (pdev->features & FEATURE_MOTOR_PANTILT) {
-                rc = video_device_create_file(vdev, &dev_attr_pan_tilt);
+                rc = device_create_file(&vdev->dev, &dev_attr_pan_tilt);
                 if (rc) goto err_button;
         }
 
         return 0;
 
 err_button:
-        video_device_remove_file(vdev, &dev_attr_button);
+        device_remove_file(&vdev->dev, &dev_attr_button);
 err:
+        PWC_ERROR("Could not create sysfs files.\n");
         return rc;
 }
 
@@ -1068,8 +1067,8 @@ static void pwc_remove_sysfs_files(struct video_device *vdev)
 {
         struct pwc_device *pdev = video_get_drvdata(vdev);
         if (pdev->features & FEATURE_MOTOR_PANTILT)
-                video_device_remove_file(vdev, &dev_attr_pan_tilt);
-        video_device_remove_file(vdev, &dev_attr_button);
+                device_remove_file(&vdev->dev, &dev_attr_pan_tilt);
+        device_remove_file(&vdev->dev, &dev_attr_button);
 }
 
 #ifdef CONFIG_USB_PWC_DEBUG
@@ -1767,9 +1766,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                 return -ENOMEM;
         }
         memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template));
-        pdev->vdev->dev = &(udev->dev);
+        pdev->vdev->parent = &(udev->dev);
         strcpy(pdev->vdev->name, name);
-        pdev->vdev->owner = THIS_MODULE;
         video_set_drvdata(pdev->vdev, pdev);
 
         pdev->release = le16_to_cpu(udev->descriptor.bcdDevice);
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 8e8e5b27e77e..74178754b39b 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -32,9 +32,11 @@
 #include <linux/smp_lock.h>
 #include <linux/version.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 #include <asm/errno.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "pwc-uncompress.h"
 #include <media/pwc-ioctl.h>
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 04eb2c3fabd8..b1d09d8e2b85 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -47,8 +47,10 @@
 #include <linux/mutex.h>
 #include <linux/videodev2.h>
 #include <linux/version.h>
+#include <linux/mm.h>
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/vmalloc.h>
 #include <linux/usb.h>
 
@@ -184,6 +186,7 @@ struct s2255_dmaqueue {
 #define S2255_FW_LOADED_DSPWAIT 1
 #define S2255_FW_SUCCESS        2
 #define S2255_FW_FAILED         3
+#define S2255_FW_DISCONNECTING  4
 
 struct s2255_fw {
         int                   fw_loaded;
@@ -263,7 +266,6 @@ struct s2255_buffer {
 
 struct s2255_fh {
         struct s2255_dev        *dev;
-        unsigned int            resources;
         const struct s2255_fmt  *fmt;
         unsigned int            width;
         unsigned int            height;
@@ -273,14 +275,9 @@ struct s2255_fh {
         /* mode below is the desired mode.
            mode in s2255_dev is the current mode that was last set */
         struct s2255_mode       mode;
+        int                     resources[MAX_CHANNELS];
 };
 
-/*
- * TODO: fixme S2255_MAX_USERS. Do not limit open driver handles.
- * Limit V4L to one stream at a time.
- */
-#define S2255_MAX_USERS         1
-
 #define CUR_USB_FWVER   774     /* current cypress EEPROM firmware version */
 #define S2255_MAJOR_VERSION     1
 #define S2255_MINOR_VERSION     13
@@ -476,10 +473,9 @@ static void s2255_timer(unsigned long user_data)
         dprintk(100, "s2255 timer\n");
         if (usb_submit_urb(data->fw_urb, GFP_ATOMIC) < 0) {
                 printk(KERN_ERR "s2255: can't submit urb\n");
-                if (data->fw) {
-                        release_firmware(data->fw);
-                        data->fw = NULL;
-                }
+                atomic_set(&data->fw_state, S2255_FW_FAILED);
+                /* wake up anything waiting for the firmware */
+                wake_up(&data->wait_fw);
                 return;
         }
 }
@@ -509,13 +505,18 @@ static void s2255_fwchunk_complete(struct urb *urb)
         struct usb_device *udev = urb->dev;
         int len;
         dprintk(100, "udev %p urb %p", udev, urb);
-        /* TODO: fixme.  reflect change in status */
         if (urb->status) {
                 dev_err(&udev->dev, "URB failed with status %d", urb->status);
+                atomic_set(&data->fw_state, S2255_FW_FAILED);
+                /* wake up anything waiting for the firmware */
+                wake_up(&data->wait_fw);
                 return;
         }
         if (data->fw_urb == NULL) {
-                dev_err(&udev->dev, "early disconncect\n");
+                dev_err(&udev->dev, "s2255 disconnected\n");
+                atomic_set(&data->fw_state, S2255_FW_FAILED);
+                /* wake up anything waiting for the firmware */
+                wake_up(&data->wait_fw);
                 return;
         }
 #define CHUNK_SIZE 512
@@ -789,7 +790,8 @@ static int res_get(struct s2255_dev *dev, struct s2255_fh *fh)
         }
         /* it's free, grab it */
         dev->resources[fh->channel] = 1;
-        dprintk(1, "res: get\n");
+        fh->resources[fh->channel] = 1;
+        dprintk(1, "s2255: res: get\n");
         mutex_unlock(&dev->lock);
         return 1;
 }
@@ -799,9 +801,18 @@ static int res_locked(struct s2255_dev *dev, struct s2255_fh *fh)
         return dev->resources[fh->channel];
 }
 
+static int res_check(struct s2255_fh *fh)
+{
+        return fh->resources[fh->channel];
+}
+
+
 static void res_free(struct s2255_dev *dev, struct s2255_fh *fh)
 {
+        mutex_lock(&dev->lock);
         dev->resources[fh->channel] = 0;
+        fh->resources[fh->channel] = 0;
+        mutex_unlock(&dev->lock);
         dprintk(1, "res: put\n");
 }
 
@@ -1232,7 +1243,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
         }
 
         if (!res_get(dev, fh)) {
-                dev_err(&dev->udev->dev, "res get busy\n");
+                dev_err(&dev->udev->dev, "s2255: stream busy\n");
                 return -EBUSY;
         }
 
@@ -1288,8 +1299,10 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
         }
         s2255_stop_acquire(dev, fh->channel);
         res = videobuf_streamoff(&fh->vb_vidq);
+        if (res < 0)
+                return res;
         res_free(dev, fh);
-        return res;
+        return 0;
 }
 
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i)
@@ -1462,12 +1475,7 @@ static int s2255_open(struct inode *inode, struct file *file)
         mutex_lock(&dev->open_lock);
 
         dev->users[cur_channel]++;
-        if (dev->users[cur_channel] > S2255_MAX_USERS) {
-                dev->users[cur_channel]--;
-                mutex_unlock(&dev->open_lock);
-                printk(KERN_INFO "s2255drv: too many open handles!\n");
-                return -EBUSY;
-        }
+        dprintk(4, "s2255: open_handles %d\n", dev->users[cur_channel]);
 
         if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_FAILED) {
                 err("2255 firmware load failed. retrying.\n");
@@ -1478,7 +1486,8 @@ static int s2255_open(struct inode *inode, struct file *file)
                                    msecs_to_jiffies(S2255_LOAD_TIMEOUT));
                 if (atomic_read(&dev->fw_data->fw_state)
                     != S2255_FW_SUCCESS) {
-                        printk(KERN_INFO "2255 FW load failed after 2 tries\n");
+                        printk(KERN_INFO "2255 FW load failed.\n");
+                        dev->users[cur_channel]--;
                         mutex_unlock(&dev->open_lock);
                         return -EFAULT;
                 }
@@ -1494,6 +1503,7 @@ static int s2255_open(struct inode *inode, struct file *file)
                     != S2255_FW_SUCCESS) {
                         printk(KERN_INFO "2255 firmware not loaded"
                                "try again\n");
+                        dev->users[cur_channel]--;
                         mutex_unlock(&dev->open_lock);
                         return -EBUSY;
                 }
@@ -1502,6 +1512,7 @@ static int s2255_open(struct inode *inode, struct file *file)
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
         if (NULL == fh) {
+                dev->users[cur_channel]--;
                 mutex_unlock(&dev->open_lock);
                 return -ENOMEM;
         }
@@ -1561,44 +1572,48 @@ static void s2255_destroy(struct kref *kref)
                 printk(KERN_ERR "s2255drv: kref problem\n");
                 return;
         }
+
+        /*
+         * Wake up any firmware load waiting (only done in .open,
+         * which holds the open_lock mutex)
+         */
+        atomic_set(&dev->fw_data->fw_state, S2255_FW_DISCONNECTING);
+        wake_up(&dev->fw_data->wait_fw);
+
         /* prevent s2255_disconnect from racing s2255_open */
         mutex_lock(&dev->open_lock);
         s2255_exit_v4l(dev);
-        /* device unregistered so no longer possible to open. open_mutex
-           can be unlocked */
+        /*
+         * device unregistered so no longer possible to open. open_mutex
+         *  can be unlocked and timers deleted afterwards.
+         */
         mutex_unlock(&dev->open_lock);
 
         /* board shutdown stops the read pipe if it is running */
         s2255_board_shutdown(dev);
 
         /* make sure firmware still not trying to load */
+        del_timer(&dev->timer);  /* only started in .probe and .open */
+
         if (dev->fw_data->fw_urb) {
                 dprintk(2, "kill fw_urb\n");
                 usb_kill_urb(dev->fw_data->fw_urb);
                 usb_free_urb(dev->fw_data->fw_urb);
                 dev->fw_data->fw_urb = NULL;
         }
+
         /*
-         * TODO: fixme(above, below): potentially leaving timers alive.
-         *                            do not ignore timeout below if
-         *                            it occurs.
+         * delete the dsp_wait timer, which sets the firmware
+         * state on completion.  This is done before fw_data
+         * is freed below.
          */
 
-        /* make sure we aren't waiting for the DSP */
-        if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_LOADED_DSPWAIT) {
-                /* if we are, wait for the wakeup for fw_success or timeout */
-                wait_event_timeout(dev->fw_data->wait_fw,
-                                   (atomic_read(&dev->fw_data->fw_state)
-                                   == S2255_FW_SUCCESS),
-                                   msecs_to_jiffies(S2255_LOAD_TIMEOUT));
-        }
+        del_timer(&dev->fw_data->dsp_wait); /* only started in .open */
 
-        if (dev->fw_data) {
-                if (dev->fw_data->fw)
-                        release_firmware(dev->fw_data->fw);
-                kfree(dev->fw_data->pfw_data);
-                kfree(dev->fw_data);
-        }
+        if (dev->fw_data->fw)
+                release_firmware(dev->fw_data->fw);
+        kfree(dev->fw_data->pfw_data);
+        kfree(dev->fw_data);
 
         usb_put_dev(dev->udev);
         dprintk(1, "%s", __func__);
@@ -1615,17 +1630,23 @@ static int s2255_close(struct inode *inode, struct file *file)
 
         mutex_lock(&dev->open_lock);
 
-        if (dev->b_acquire[fh->channel])
-                s2255_stop_acquire(dev, fh->channel);
-        res_free(dev, fh);
+        /* turn off stream */
+        if (res_check(fh)) {
+                if (dev->b_acquire[fh->channel])
+                        s2255_stop_acquire(dev, fh->channel);
+                videobuf_streamoff(&fh->vb_vidq);
+                res_free(dev, fh);
+        }
+
         videobuf_mmap_free(&fh->vb_vidq);
-        kfree(fh);
         dev->users[fh->channel]--;
+
         mutex_unlock(&dev->open_lock);
 
         kref_put(&dev->kref, s2255_destroy);
         dprintk(1, "s2255: close called (minor=%d, users=%d)\n",
                 minor, dev->users[fh->channel]);
+        kfree(fh);
         return 0;
 }
 
@@ -1658,12 +1679,7 @@ static const struct file_operations s2255_fops_v4l = {
         .llseek = no_llseek,
 };
 
-static struct video_device template = {
-        .name = "s2255v",
-        .type = VID_TYPE_CAPTURE,
-        .fops = &s2255_fops_v4l,
-        .minor = -1,
-        .release = video_device_release,
+static const struct v4l2_ioctl_ops s2255_ioctl_ops = {
         .vidioc_querycap = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
@@ -1685,6 +1701,14 @@ static struct video_device template = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         .vidiocgmbuf = vidioc_cgmbuf,
 #endif
+};
+
+static struct video_device template = {
+        .name = "s2255v",
+        .fops = &s2255_fops_v4l,
+        .ioctl_ops = &s2255_ioctl_ops,
+        .minor = -1,
+        .release = video_device_release,
         .tvnorms = S2255_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
 };
@@ -1706,7 +1730,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                 /* register 4 video devices */
                 dev->vdev[i] = video_device_alloc();
                 memcpy(dev->vdev[i], &template, sizeof(struct video_device));
-                dev->vdev[i]->dev = &dev->interface->dev;
+                dev->vdev[i]->parent = &dev->interface->dev;
                 if (video_nr == -1)
                         ret = video_register_device(dev->vdev[i],
                                                     VFL_TYPE_GRABBER,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 03e772130b55..6ee63e69b36c 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -46,6 +46,7 @@
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 #include "saa5246a.h"
@@ -829,9 +830,7 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .owner    = THIS_MODULE,
         .name     = IF_NAME,
-        .type     = VID_TYPE_TELETEXT,
         .fops     = &saa_fops,
         .release  = video_device_release,
         .minor    = -1,
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index fde99d9ee71f..0d639738d4e6 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -57,6 +57,7 @@
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 
@@ -710,9 +711,7 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .owner          = THIS_MODULE,
         .name           = IF_NAME,
-        .type           = VID_TYPE_TELETEXT,    /*| VID_TYPE_TUNER ?? */
         .fops           = &saa_fops,
 };
 
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 83f076abce35..7021bbf5897b 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -27,9 +27,7 @@ config VIDEO_SAA7134_ALSA
 config VIDEO_SAA7134_DVB
         tristate "DVB/ATSC Support for saa7134 based TV cards"
         depends on VIDEO_SAA7134 && DVB_CORE
-        depends on HOTPLUG      # due to FW_LOADER
         select VIDEOBUF_DVB
-        select FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 6893f998d292..98364d171def 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5853,9 +5853,6 @@ int saa7134_board_init2(struct saa7134_dev *dev)
         unsigned char buf;
         int board;
 
-        dev->tuner_type = saa7134_boards[dev->board].tuner_type;
-        dev->tuner_addr = saa7134_boards[dev->board].tuner_addr;
-
         switch (dev->board) {
         case SAA7134_BOARD_BMK_MPEX_NOTUNER:
         case SAA7134_BOARD_BMK_MPEX_TUNER:
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index cfee84ee7a88..75d618415f4f 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -798,7 +798,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
                 return NULL;
         *vfd = *template;
         vfd->minor   = -1;
-        vfd->dev     = &dev->pci->dev;
+        vfd->parent  = &dev->pci->dev;
         vfd->release = video_device_release;
         vfd->debug   = video_debug;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
@@ -945,11 +945,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                 dev->board = SAA7134_BOARD_UNKNOWN;
         }
         dev->autodetected = card[dev->nr] != dev->board;
-        dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
+        dev->tuner_type = saa7134_boards[dev->board].tuner_type;
+        dev->tuner_addr = saa7134_boards[dev->board].tuner_addr;
         dev->tda9887_conf = saa7134_boards[dev->board].tda9887_conf;
         if (UNSET != tuner[dev->nr])
                 dev->tuner_type = tuner[dev->nr];
-                printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+        printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
                 dev->name,pci_dev->subsystem_vendor,
                 pci_dev->subsystem_device,saa7134_boards[dev->board].name,
                 dev->board, dev->autodetected ?
@@ -1007,11 +1008,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         v4l2_prio_init(&dev->prio);
 
         /* register v4l devices */
-        if (saa7134_no_overlay <= 0) {
-                saa7134_video_template.type |= VID_TYPE_OVERLAY;
-        } else {
-                printk("%s: Overlay support disabled.\n",dev->name);
-        }
+        if (saa7134_no_overlay > 0)
+                printk(KERN_INFO "%s: Overlay support disabled.\n", dev->name);
+
         dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");
         err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
                                     video_nr[dev->nr]);
@@ -1024,7 +1023,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                dev->name,dev->video_dev->minor & 0x1f);
 
         dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi");
-        dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT;
 
         err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
                                     vbi_nr[dev->nr]);
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 2a5ab957542d..c0c5d7509c25 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -89,14 +89,14 @@ static int ts_open(struct inode *inode, struct file *file)
         err = -EBUSY;
         if (!mutex_trylock(&dev->empress_tsq.vb_lock))
                 goto done;
-        if (dev->empress_users)
+        if (atomic_read(&dev->empress_users))
                 goto done_up;
 
         /* Unmute audio */
         saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
                 saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6));
 
-        dev->empress_users++;
+        atomic_inc(&dev->empress_users);
         file->private_data = dev;
         err = 0;
 
@@ -110,8 +110,6 @@ static int ts_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        mutex_lock(&dev->empress_tsq.vb_lock);
-
         videobuf_stop(&dev->empress_tsq);
         videobuf_mmap_free(&dev->empress_tsq);
 
@@ -122,9 +120,7 @@ static int ts_release(struct inode *inode, struct file *file)
         saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
                 saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6));
 
-        dev->empress_users--;
-
-        mutex_unlock(&dev->empress_tsq.vb_lock);
+        atomic_dec(&dev->empress_users);
 
         return 0;
 }
@@ -333,6 +329,22 @@ static int empress_g_ext_ctrls(struct file *file, void *priv,
         return saa7134_i2c_call_saa6752(dev, VIDIOC_G_EXT_CTRLS, ctrls);
 }
 
+static int empress_g_ctrl(struct file *file, void *priv,
+                                        struct v4l2_control *c)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        return saa7134_g_ctrl_internal(dev, NULL, c);
+}
+
+static int empress_s_ctrl(struct file *file, void *priv,
+                                        struct v4l2_control *c)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        return saa7134_s_ctrl_internal(dev, NULL, c);
+}
+
 static int empress_queryctrl(struct file *file, void *priv,
                                         struct v4l2_queryctrl *c)
 {
@@ -400,16 +412,7 @@ static const struct file_operations ts_fops =
         .llseek   = no_llseek,
 };
 
-/* ----------------------------------------------------------- */
-
-static struct video_device saa7134_empress_template =
-{
-        .name          = "saa7134-empress",
-        .type          = 0 /* FIXME */,
-        .type2         = 0 /* FIXME */,
-        .fops          = &ts_fops,
-        .minor         = -1,
-
+static const struct v4l2_ioctl_ops ts_ioctl_ops = {
         .vidioc_querycap                = empress_querycap,
         .vidioc_enum_fmt_vid_cap        = empress_enum_fmt_vid_cap,
         .vidioc_s_fmt_vid_cap           = empress_s_fmt_vid_cap,
@@ -428,8 +431,17 @@ static struct video_device saa7134_empress_template =
 
         .vidioc_queryctrl               = empress_queryctrl,
         .vidioc_querymenu               = empress_querymenu,
-        .vidioc_g_ctrl                  = saa7134_g_ctrl,
-        .vidioc_s_ctrl                  = saa7134_s_ctrl,
+        .vidioc_g_ctrl                  = empress_g_ctrl,
+        .vidioc_s_ctrl                  = empress_s_ctrl,
+};
+
+/* ----------------------------------------------------------- */
+
+static struct video_device saa7134_empress_template = {
+        .name          = "saa7134-empress",
+        .fops          = &ts_fops,
+        .minor         = -1,
+        .ioctl_ops     = &ts_ioctl_ops,
 
         .tvnorms                        = SAA7134_NORMS,
         .current_norm                   = V4L2_STD_PAL,
@@ -445,7 +457,7 @@ static void empress_signal_update(struct work_struct *work)
                 ts_reset_encoder(dev);
         } else {
                 dprintk("video signal acquired\n");
-                if (dev->empress_users)
+                if (atomic_read(&dev->empress_users))
                         ts_init_encoder(dev);
         }
 }
@@ -465,7 +477,7 @@ static int empress_init(struct saa7134_dev *dev)
         if (NULL == dev->empress_dev)
                 return -ENOMEM;
         *(dev->empress_dev) = saa7134_empress_template;
-        dev->empress_dev->dev     = &dev->pci->dev;
+        dev->empress_dev->parent  = &dev->pci->dev;
         dev->empress_dev->release = video_device_release;
         snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name),
                  "%s empress (%s)", dev->name,
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 1a5137550e7a..68c268981861 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1112,10 +1112,8 @@ static struct videobuf_queue_ops video_qops = {
 
 /* ------------------------------------------------------------------ */
 
-int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
+int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c)
 {
-        struct saa7134_fh *fh = priv;
-        struct saa7134_dev *dev = fh->dev;
         const struct v4l2_queryctrl* ctrl;
 
         ctrl = ctrl_by_id(c->id);
@@ -1160,20 +1158,31 @@ int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
         }
         return 0;
 }
-EXPORT_SYMBOL_GPL(saa7134_g_ctrl);
+EXPORT_SYMBOL_GPL(saa7134_g_ctrl_internal);
+
+static int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
+{
+        struct saa7134_fh *fh = priv;
+
+        return saa7134_g_ctrl_internal(fh->dev, fh, c);
+}
 
-int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
+int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c)
 {
         const struct v4l2_queryctrl* ctrl;
-        struct saa7134_fh *fh = f;
-        struct saa7134_dev *dev = fh->dev;
         unsigned long flags;
         int restart_overlay = 0;
-        int err = -EINVAL;
+        int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-                return err;
+        /* When called from the empress code fh == NULL.
+           That needs to be fixed somehow, but for now this is
+           good enough. */
+        if (fh) {
+                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                if (0 != err)
+                        return err;
+        }
+        err = -EINVAL;
 
         mutex_lock(&dev->lock);
 
@@ -1274,7 +1283,14 @@ error:
         mutex_unlock(&dev->lock);
         return err;
 }
-EXPORT_SYMBOL_GPL(saa7134_s_ctrl);
+EXPORT_SYMBOL_GPL(saa7134_s_ctrl_internal);
+
+static int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
+{
+        struct saa7134_fh *fh = f;
+
+        return saa7134_s_ctrl_internal(fh->dev, fh, c);
+}
 
 /* ------------------------------------------------------------------ */
 
@@ -2353,26 +2369,7 @@ static const struct file_operations video_fops =
         .llseek   = no_llseek,
 };
 
-static const struct file_operations radio_fops =
-{
-        .owner    = THIS_MODULE,
-        .open     = video_open,
-        .release  = video_release,
-        .ioctl    = video_ioctl2,
-        .compat_ioctl   = v4l_compat_ioctl32,
-        .llseek   = no_llseek,
-};
-
-/* ----------------------------------------------------------- */
-/* exported stuff                                              */
-
-struct video_device saa7134_video_template =
-{
-        .name                           = "saa7134-video",
-        .type                           = VID_TYPE_CAPTURE|VID_TYPE_TUNER |
-                                        VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-        .fops                           = &video_fops,
-        .minor                          = -1,
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querycap                = saa7134_querycap,
         .vidioc_enum_fmt_vid_cap        = saa7134_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap           = saa7134_g_fmt_vid_cap,
@@ -2421,16 +2418,18 @@ struct video_device saa7134_video_template =
         .vidioc_g_register              = vidioc_g_register,
         .vidioc_s_register              = vidioc_s_register,
 #endif
-        .tvnorms                        = SAA7134_NORMS,
-        .current_norm                   = V4L2_STD_PAL,
 };
 
-struct video_device saa7134_radio_template =
-{
-        .name                   = "saa7134-radio",
-        .type                   = VID_TYPE_TUNER,
-        .fops                   = &radio_fops,
-        .minor                  = -1,
+static const struct file_operations radio_fops = {
+        .owner    = THIS_MODULE,
+        .open     = video_open,
+        .release  = video_release,
+        .ioctl    = video_ioctl2,
+        .compat_ioctl   = v4l_compat_ioctl32,
+        .llseek   = no_llseek,
+};
+
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_querycap        = radio_querycap,
         .vidioc_g_tuner         = radio_g_tuner,
         .vidioc_enum_input      = radio_enum_input,
@@ -2447,6 +2446,25 @@ struct video_device saa7134_radio_template =
         .vidioc_s_frequency     = saa7134_s_frequency,
 };
 
+/* ----------------------------------------------------------- */
+/* exported stuff                                              */
+
+struct video_device saa7134_video_template = {
+        .name                           = "saa7134-video",
+        .fops                           = &video_fops,
+        .ioctl_ops                      = &video_ioctl_ops,
+        .minor                          = -1,
+        .tvnorms                        = SAA7134_NORMS,
+        .current_norm                   = V4L2_STD_PAL,
+};
+
+struct video_device saa7134_radio_template = {
+        .name                   = "saa7134-radio",
+        .fops                   = &radio_fops,
+        .ioctl_ops              = &radio_ioctl_ops,
+        .minor                  = -1,
+};
+
 int saa7134_video_init1(struct saa7134_dev *dev)
 {
         /* sanitycheck insmod options */
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 6927cbea8624..a0884f639f65 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -34,6 +34,7 @@
 #include <asm/io.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
@@ -560,7 +561,7 @@ struct saa7134_dev {
         /* SAA7134_MPEG_EMPRESS only */
         struct video_device        *empress_dev;
         struct videobuf_queue      empress_tsq;
-        unsigned int               empress_users;
+        atomic_t                   empress_users;
         struct work_struct         empress_workqueue;
         int                        empress_started;
 
@@ -662,8 +663,8 @@ extern unsigned int video_debug;
 extern struct video_device saa7134_video_template;
 extern struct video_device saa7134_radio_template;
 
-int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c);
-int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c);
+int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
+int saa7134_g_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
 int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c);
 
 int saa7134_videoport_init(struct saa7134_dev *dev);
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 2220f9569941..af60ede5310d 100644
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -35,7 +35,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h
index cd4b6354a7b3..e69de29bb2d1 100644
--- a/drivers/media/video/saa7196.h
+++ b/drivers/media/video/saa7196.h
@@ -1,117 +0,0 @@
-/*
-    Definitions for the Philips SAA7196 digital video decoder,
-    scaler, and clock generator circuit (DESCpro), as used in
-    the PlanB video input of the Powermac 7x00/8x00 series.
-
-    Copyright (C) 1998 Michel Lanners (mlan@cpu.lu)
-
-    The register defines are shamelessly copied from the meteor
-    driver out of NetBSD (with permission),
-    and are copyrighted (c) 1995 Mark Tinguely and Jim Lowe
-    (Thanks !)
-
-    Additional debugging and coding by Takashi Oe (toe@unlinfo.unl.edu)
-
-    The default values used for PlanB are my mistakes.
-*/
-
-/* $Id: saa7196.h,v 1.5 1999/03/26 23:28:47 mlan Exp $ */
-
-#ifndef _SAA7196_H_
-#define _SAA7196_H_
-
-#define SAA7196_NUMREGS 0x31    /* Number of registers (used)*/
-#define NUM_SUPPORTED_NORM 3    /* Number of supported norms by PlanB */
-
-/* Decoder part: */
-#define SAA7196_IDEL    0x00    /* Increment delay */
-#define SAA7196_HSB5    0x01    /* H-sync begin; 50 hz */
-#define SAA7196_HSS5    0x02    /* H-sync stop; 50 hz */
-#define SAA7196_HCB5    0x03    /* H-clamp begin; 50 hz */
-#define SAA7196_HCS5    0x04    /* H-clamp stop; 50 hz */
-#define SAA7196_HSP5    0x05    /* H-sync after PHI1; 50 hz */
-#define SAA7196_LUMC    0x06    /* Luminance control */
-#define SAA7196_HUEC    0x07    /* Hue control */
-#define SAA7196_CKTQ    0x08    /* Colour Killer Threshold QAM (PAL, NTSC) */
-#define SAA7196_CKTS    0x09    /* Colour Killer Threshold SECAM */
-#define SAA7196_PALS    0x0a    /* PAL switch sensitivity */
-#define SAA7196_SECAMS  0x0b    /* SECAM switch sensitivity */
-#define SAA7196_CGAINC  0x0c    /* Chroma gain control */
-#define SAA7196_STDC    0x0d    /* Standard/Mode control */
-#define SAA7196_IOCC    0x0e    /* I/O and Clock Control */
-#define SAA7196_CTRL1   0x0f    /* Control #1 */
-#define SAA7196_CTRL2   0x10    /* Control #2 */
-#define SAA7196_CGAINR  0x11    /* Chroma Gain Reference */
-#define SAA7196_CSAT    0x12    /* Chroma Saturation */
-#define SAA7196_CONT    0x13    /* Luminance Contrast */
-#define SAA7196_HSB6    0x14    /* H-sync begin; 60 hz */
-#define SAA7196_HSS6    0x15    /* H-sync stop; 60 hz */
-#define SAA7196_HCB6    0x16    /* H-clamp begin; 60 hz */
-#define SAA7196_HCS6    0x17    /* H-clamp stop; 60 hz */
-#define SAA7196_HSP6    0x18    /* H-sync after PHI1; 60 hz */
-#define SAA7196_BRIG    0x19    /* Luminance Brightness */
-
-/* Scaler part: */
-#define SAA7196_FMTS    0x20    /* Formats and sequence */
-#define SAA7196_OUTPIX  0x21    /* Output data pixel/line */
-#define SAA7196_INPIX   0x22    /* Input data pixel/line */
-#define SAA7196_HWS     0x23    /* Horiz. window start */
-#define SAA7196_HFILT   0x24    /* Horiz. filter */
-#define SAA7196_OUTLINE 0x25    /* Output data lines/field */
-#define SAA7196_INLINE  0x26    /* Input data lines/field */
-#define SAA7196_VWS     0x27    /* Vertical window start */
-#define SAA7196_VYP     0x28    /* AFS/vertical Y processing */
-#define SAA7196_VBS     0x29    /* Vertical Bypass start */
-#define SAA7196_VBCNT   0x2a    /* Vertical Bypass count */
-#define SAA7196_VBP     0x2b    /* veritcal Bypass Polarity */
-#define SAA7196_VLOW    0x2c    /* Colour-keying lower V limit */
-#define SAA7196_VHIGH   0x2d    /* Colour-keying upper V limit */
-#define SAA7196_ULOW    0x2e    /* Colour-keying lower U limit */
-#define SAA7196_UHIGH   0x2f    /* Colour-keying upper U limit */
-#define SAA7196_DPATH   0x30    /* Data path setting  */
-
-/* Initialization default values: */
-
-unsigned char saa_regs[NUM_SUPPORTED_NORM][SAA7196_NUMREGS] = {
-
-/* PAL, 768x576 (no scaling), composite video-in */
-/* Decoder: */
-      { 0x50, 0x30, 0x00, 0xe8, 0xb6, 0xe5, 0x63, 0xff,
-        0xfe, 0xf0, 0xfe, 0xe0, 0x20, 0x06, 0x3b, 0x98,
-        0x00, 0x59, 0x41, 0x45, 0x34, 0x0a, 0xf4, 0xd2,
-        0xe9, 0xa2,
-/* Padding */
-                    0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* Scaler: */
-        0x72, 0x80, 0x00, 0x03, 0x8d, 0x20, 0x20, 0x12,
-        0xa5, 0x12, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
-        0x87 },
-
-/* NTSC, 640x480? (no scaling), composite video-in */
-/* Decoder: */
-      { 0x50, 0x30, 0x00, 0xe8, 0xb6, 0xe5, 0x50, 0x00,
-        0xf8, 0xf0, 0xfe, 0xe0, 0x00, 0x06, 0x3b, 0x98,
-        0x00, 0x2c, 0x3d, 0x40, 0x34, 0x0a, 0xf4, 0xd2,
-        0xe9, 0x98,
-/* Padding */
-                    0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* Scaler: */
-        0x72, 0x80, 0x80, 0x03, 0x89, 0xf0, 0xf0, 0x0d,
-        0xa0, 0x0d, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
-        0x87 },
-
-/* SECAM, 768x576 (no scaling), composite video-in */
-/* Decoder: */
-      { 0x50, 0x30, 0x00, 0xe8, 0xb6, 0xe5, 0x63, 0xff,
-        0xfe, 0xf0, 0xfe, 0xe0, 0x20, 0x07, 0x3b, 0x98,
-        0x00, 0x59, 0x41, 0x45, 0x34, 0x0a, 0xf4, 0xd2,
-        0xe9, 0xa2,
-/* Padding */
-                    0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* Scaler: */
-        0x72, 0x80, 0x00, 0x03, 0x8d, 0x20, 0x20, 0x12,
-        0xa5, 0x12, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
-        0x87 }
-        };
-
-#endif /* _SAA7196_H_ */
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 1cd629380f71..f481277892da 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1230,9 +1230,7 @@ static const struct file_operations se401_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device se401_template = {
-        .owner =        THIS_MODULE,
         .name =         "se401 USB camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &se401_fops,
 };
 
diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h
index 835ef872e803..2ce685db5d8b 100644
--- a/drivers/media/video/se401.h
+++ b/drivers/media/video/se401.h
@@ -5,6 +5,7 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 #define se401_DEBUG     /* Turn on debug messages */
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 012005e1a77b..f7ca3cb9340a 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -91,6 +91,7 @@ struct sh_mobile_ceu_dev {
         void __iomem *base;
         unsigned long video_limit;
 
+        /* lock used to protect videobuf */
         spinlock_t lock;
         struct list_head capture;
         struct videobuf_buffer *active;
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index 0c8d87d8d18d..cbfc44433b99 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -25,6 +25,7 @@
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 7f9c7bcf3c85..23408764d0ef 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1038,8 +1038,7 @@ static ssize_t sn9c102_show_reg(struct device* cd,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1064,8 +1063,7 @@ sn9c102_store_reg(struct device* cd, struct device_attribute *attr,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1098,8 +1096,7 @@ static ssize_t sn9c102_show_val(struct device* cd,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1132,8 +1129,7 @@ sn9c102_store_val(struct device* cd, struct device_attribute *attr,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1170,8 +1166,7 @@ static ssize_t sn9c102_show_i2c_reg(struct device* cd,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1198,8 +1193,7 @@ sn9c102_store_i2c_reg(struct device* cd, struct device_attribute *attr,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1232,8 +1226,7 @@ static ssize_t sn9c102_show_i2c_val(struct device* cd,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1271,8 +1264,7 @@ sn9c102_store_i2c_val(struct device* cd, struct device_attribute *attr,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1318,8 +1310,7 @@ sn9c102_store_green(struct device* cd, struct device_attribute *attr,
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1400,8 +1391,7 @@ static ssize_t sn9c102_show_frame_header(struct device* cd,
         struct sn9c102_device* cam;
         ssize_t count;
 
-        cam = video_get_drvdata(container_of(cd, struct video_device,
-                                             class_dev));
+        cam = video_get_drvdata(container_of(cd, struct video_device, dev));
         if (!cam)
                 return -ENODEV;
 
@@ -1428,49 +1418,49 @@ static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
 
 static int sn9c102_create_sysfs(struct sn9c102_device* cam)
 {
-        struct device *classdev = &(cam->v4ldev->class_dev);
+        struct device *dev = &(cam->v4ldev->dev);
         int err = 0;
 
-        if ((err = device_create_file(classdev, &dev_attr_reg)))
+        if ((err = device_create_file(dev, &dev_attr_reg)))
                 goto err_out;
-        if ((err = device_create_file(classdev, &dev_attr_val)))
+        if ((err = device_create_file(dev, &dev_attr_val)))
                 goto err_reg;
-        if ((err = device_create_file(classdev, &dev_attr_frame_header)))
+        if ((err = device_create_file(dev, &dev_attr_frame_header)))
                 goto err_val;
 
         if (cam->sensor.sysfs_ops) {
-                if ((err = device_create_file(classdev, &dev_attr_i2c_reg)))
+                if ((err = device_create_file(dev, &dev_attr_i2c_reg)))
                         goto err_frame_header;
-                if ((err = device_create_file(classdev, &dev_attr_i2c_val)))
+                if ((err = device_create_file(dev, &dev_attr_i2c_val)))
                         goto err_i2c_reg;
         }
 
         if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) {
-                if ((err = device_create_file(classdev, &dev_attr_green)))
+                if ((err = device_create_file(dev, &dev_attr_green)))
                         goto err_i2c_val;
         } else {
-                if ((err = device_create_file(classdev, &dev_attr_blue)))
+                if ((err = device_create_file(dev, &dev_attr_blue)))
                         goto err_i2c_val;
-                if ((err = device_create_file(classdev, &dev_attr_red)))
+                if ((err = device_create_file(dev, &dev_attr_red)))
                         goto err_blue;
         }
 
         return 0;
 
 err_blue:
-        device_remove_file(classdev, &dev_attr_blue);
+        device_remove_file(dev, &dev_attr_blue);
 err_i2c_val:
         if (cam->sensor.sysfs_ops)
-                device_remove_file(classdev, &dev_attr_i2c_val);
+                device_remove_file(dev, &dev_attr_i2c_val);
 err_i2c_reg:
         if (cam->sensor.sysfs_ops)
-                device_remove_file(classdev, &dev_attr_i2c_reg);
+                device_remove_file(dev, &dev_attr_i2c_reg);
 err_frame_header:
-        device_remove_file(classdev, &dev_attr_frame_header);
+        device_remove_file(dev, &dev_attr_frame_header);
 err_val:
-        device_remove_file(classdev, &dev_attr_val);
+        device_remove_file(dev, &dev_attr_val);
 err_reg:
-        device_remove_file(classdev, &dev_attr_reg);
+        device_remove_file(dev, &dev_attr_reg);
 err_out:
         return err;
 }
@@ -3319,8 +3309,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &sn9c102_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e39b98f1eca4..b6be5ee678b6 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -25,6 +25,7 @@
 #include <linux/vmalloc.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/v4l2-dev.h>
 #include <media/videobuf-core.h>
 #include <media/soc_camera.h>
@@ -193,7 +194,7 @@ static int soc_camera_open(struct inode *inode, struct file *file)
         mutex_lock(&video_lock);
 
         vdev = video_devdata(file);
-        icd = container_of(vdev->dev, struct soc_camera_device, dev);
+        icd = container_of(vdev->parent, struct soc_camera_device, dev);
         ici = to_soc_camera_host(icd->dev.parent);
 
         if (!try_module_get(icd->ops->owner)) {
@@ -258,7 +259,7 @@ static int soc_camera_close(struct inode *inode, struct file *file)
 
         vfree(icf);
 
-        dev_dbg(vdev->dev, "camera device close\n");
+        dev_dbg(vdev->parent, "camera device close\n");
 
         return 0;
 }
@@ -271,7 +272,7 @@ static ssize_t soc_camera_read(struct file *file, char __user *buf,
         struct video_device *vdev = icd->vdev;
         int err = -EINVAL;
 
-        dev_err(vdev->dev, "camera device read not implemented\n");
+        dev_err(vdev->parent, "camera device read not implemented\n");
 
         return err;
 }
@@ -861,6 +862,35 @@ void soc_camera_device_unregister(struct soc_camera_device *icd)
 }
 EXPORT_SYMBOL(soc_camera_device_unregister);
 
+static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {
+        .vidioc_querycap         = soc_camera_querycap,
+        .vidioc_g_fmt_vid_cap    = soc_camera_g_fmt_vid_cap,
+        .vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap    = soc_camera_s_fmt_vid_cap,
+        .vidioc_enum_input       = soc_camera_enum_input,
+        .vidioc_g_input          = soc_camera_g_input,
+        .vidioc_s_input          = soc_camera_s_input,
+        .vidioc_s_std            = soc_camera_s_std,
+        .vidioc_reqbufs          = soc_camera_reqbufs,
+        .vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,
+        .vidioc_querybuf         = soc_camera_querybuf,
+        .vidioc_qbuf             = soc_camera_qbuf,
+        .vidioc_dqbuf            = soc_camera_dqbuf,
+        .vidioc_streamon         = soc_camera_streamon,
+        .vidioc_streamoff        = soc_camera_streamoff,
+        .vidioc_queryctrl        = soc_camera_queryctrl,
+        .vidioc_g_ctrl           = soc_camera_g_ctrl,
+        .vidioc_s_ctrl           = soc_camera_s_ctrl,
+        .vidioc_cropcap          = soc_camera_cropcap,
+        .vidioc_g_crop           = soc_camera_g_crop,
+        .vidioc_s_crop           = soc_camera_s_crop,
+        .vidioc_g_chip_ident     = soc_camera_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register       = soc_camera_g_register,
+        .vidioc_s_register       = soc_camera_s_register,
+#endif
+};
+
 int soc_camera_video_start(struct soc_camera_device *icd)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
@@ -877,45 +907,19 @@ int soc_camera_video_start(struct soc_camera_device *icd)
 
         strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name));
         /* Maybe better &ici->dev */
-        vdev->dev               = &icd->dev;
-        vdev->type              = VID_TYPE_CAPTURE;
+        vdev->parent            = &icd->dev;
         vdev->current_norm      = V4L2_STD_UNKNOWN;
         vdev->fops              = &soc_camera_fops;
+        vdev->ioctl_ops         = &soc_camera_ioctl_ops;
         vdev->release           = video_device_release;
         vdev->minor             = -1;
         vdev->tvnorms           = V4L2_STD_UNKNOWN,
-        vdev->vidioc_querycap   = soc_camera_querycap;
-        vdev->vidioc_g_fmt_vid_cap = soc_camera_g_fmt_vid_cap;
-        vdev->vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap;
-        vdev->vidioc_s_fmt_vid_cap = soc_camera_s_fmt_vid_cap;
-        vdev->vidioc_enum_input = soc_camera_enum_input;
-        vdev->vidioc_g_input    = soc_camera_g_input;
-        vdev->vidioc_s_input    = soc_camera_s_input;
-        vdev->vidioc_s_std      = soc_camera_s_std;
-        vdev->vidioc_reqbufs    = soc_camera_reqbufs;
-        vdev->vidioc_try_fmt_vid_cap = soc_camera_try_fmt_vid_cap;
-        vdev->vidioc_querybuf   = soc_camera_querybuf;
-        vdev->vidioc_qbuf       = soc_camera_qbuf;
-        vdev->vidioc_dqbuf      = soc_camera_dqbuf;
-        vdev->vidioc_streamon   = soc_camera_streamon;
-        vdev->vidioc_streamoff  = soc_camera_streamoff;
-        vdev->vidioc_queryctrl  = soc_camera_queryctrl;
-        vdev->vidioc_g_ctrl     = soc_camera_g_ctrl;
-        vdev->vidioc_s_ctrl     = soc_camera_s_ctrl;
-        vdev->vidioc_cropcap    = soc_camera_cropcap;
-        vdev->vidioc_g_crop     = soc_camera_g_crop;
-        vdev->vidioc_s_crop     = soc_camera_s_crop;
-        vdev->vidioc_g_chip_ident = soc_camera_g_chip_ident;
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        vdev->vidioc_g_register = soc_camera_g_register;
-        vdev->vidioc_s_register = soc_camera_s_register;
-#endif
 
         icd->current_fmt = &icd->formats[0];
 
         err = video_register_device(vdev, VFL_TYPE_GRABBER, vdev->minor);
         if (err < 0) {
-                dev_err(vdev->dev, "video_register_device failed\n");
+                dev_err(vdev->parent, "video_register_device failed\n");
                 goto evidregd;
         }
         icd->vdev = vdev;
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index f308c38d744f..ad36af30e099 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -34,6 +34,7 @@
 #include <linux/vmalloc.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "stk-webcam.h"
 
@@ -340,17 +341,19 @@ static int stk_create_sysfs_files(struct video_device *vdev)
 {
         int ret;
 
-        ret = video_device_create_file(vdev, &dev_attr_brightness);
-        ret += video_device_create_file(vdev, &dev_attr_hflip);
-        ret += video_device_create_file(vdev, &dev_attr_vflip);
+        ret = device_create_file(&vdev->dev, &dev_attr_brightness);
+        ret += device_create_file(&vdev->dev, &dev_attr_hflip);
+        ret += device_create_file(&vdev->dev, &dev_attr_vflip);
+        if (ret)
+                STK_WARNING("Could not create sysfs files\n");
         return ret;
 }
 
 static void stk_remove_sysfs_files(struct video_device *vdev)
 {
-        video_device_remove_file(vdev, &dev_attr_brightness);
-        video_device_remove_file(vdev, &dev_attr_hflip);
-        video_device_remove_file(vdev, &dev_attr_vflip);
+        device_remove_file(&vdev->dev, &dev_attr_brightness);
+        device_remove_file(&vdev->dev, &dev_attr_hflip);
+        device_remove_file(&vdev->dev, &dev_attr_vflip);
 }
 
 #else
@@ -442,18 +445,19 @@ static void stk_isoc_handler(struct urb *urb)
                                 fb->v4lbuf.bytesused = 0;
                                 fill = fb->buffer;
                         } else if (fb->v4lbuf.bytesused == dev->frame_size) {
-                                list_move_tail(dev->sio_avail.next,
-                                        &dev->sio_full);
-                                wake_up(&dev->wait_frame);
-                                if (list_empty(&dev->sio_avail)) {
-                                        (void) (printk_ratelimit() &&
-                                        STK_ERROR("No buffer available\n"));
-                                        goto resubmit;
+                                if (list_is_singular(&dev->sio_avail)) {
+                                        /* Always reuse the last buffer */
+                                        fb->v4lbuf.bytesused = 0;
+                                        fill = fb->buffer;
+                                } else {
+                                        list_move_tail(dev->sio_avail.next,
+                                                &dev->sio_full);
+                                        wake_up(&dev->wait_frame);
+                                        fb = list_first_entry(&dev->sio_avail,
+                                                struct stk_sio_buffer, list);
+                                        fb->v4lbuf.bytesused = 0;
+                                        fill = fb->buffer;
                                 }
-                                fb = list_first_entry(&dev->sio_avail,
-                                        struct stk_sio_buffer, list);
-                                fb->v4lbuf.bytesused = 0;
-                                fill = fb->buffer;
                         }
                 } else {
                         framelen -= 4;
@@ -1327,20 +1331,7 @@ static struct file_operations v4l_stk_fops = {
         .llseek = no_llseek
 };
 
-static void stk_v4l_dev_release(struct video_device *vd)
-{
-}
-
-static struct video_device stk_v4l_data = {
-        .name = "stkwebcam",
-        .type = VFL_TYPE_GRABBER,
-        .type2 = VID_TYPE_CAPTURE,
-        .minor = -1,
-        .tvnorms = V4L2_STD_UNKNOWN,
-        .current_norm = V4L2_STD_UNKNOWN,
-        .fops = &v4l_stk_fops,
-        .release = stk_v4l_dev_release,
-
+static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
         .vidioc_querycap = stk_vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap = stk_vidioc_try_fmt_vid_cap,
@@ -1362,6 +1353,20 @@ static struct video_device stk_v4l_data = {
         .vidioc_g_parm = stk_vidioc_g_parm,
 };
 
+static void stk_v4l_dev_release(struct video_device *vd)
+{
+}
+
+static struct video_device stk_v4l_data = {
+        .name = "stkwebcam",
+        .minor = -1,
+        .tvnorms = V4L2_STD_UNKNOWN,
+        .current_norm = V4L2_STD_UNKNOWN,
+        .fops = &v4l_stk_fops,
+        .ioctl_ops = &v4l_stk_ioctl_ops,
+        .release = stk_v4l_dev_release,
+};
+
 
 static int stk_register_video_device(struct stk_camera *dev)
 {
@@ -1369,7 +1374,7 @@ static int stk_register_video_device(struct stk_camera *dev)
 
         dev->vdev = stk_v4l_data;
         dev->vdev.debug = debug;
-        dev->vdev.dev = &dev->interface->dev;
+        dev->vdev.parent = &dev->interface->dev;
         dev->vdev.priv = dev;
         err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
         if (err)
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index c109511f21ea..276bded06ab3 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -43,6 +43,7 @@
 #include <linux/vmalloc.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "saa7146.h"
 #include "saa7146reg.h"
@@ -1918,7 +1919,6 @@ static const struct file_operations saa_fops = {
 /* template for video_device-structure */
 static struct video_device saa_template = {
         .name = "SAA7146A",
-        .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
         .fops = &saa_fops,
         .minor = -1,
 };
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index d7f130bedb5f..56dc3d6b5b29 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -66,6 +66,7 @@
 #include <linux/errno.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
@@ -524,53 +525,54 @@ static int stv680_create_sysfs_files(struct video_device *vdev)
 {
         int rc;
 
-        rc = video_device_create_file(vdev, &dev_attr_model);
+        rc = device_create_file(&vdev->dev, &dev_attr_model);
         if (rc) goto err;
-        rc = video_device_create_file(vdev, &dev_attr_in_use);
+        rc = device_create_file(&vdev->dev, &dev_attr_in_use);
         if (rc) goto err_model;
-        rc = video_device_create_file(vdev, &dev_attr_streaming);
+        rc = device_create_file(&vdev->dev, &dev_attr_streaming);
         if (rc) goto err_inuse;
-        rc = video_device_create_file(vdev, &dev_attr_palette);
+        rc = device_create_file(&vdev->dev, &dev_attr_palette);
         if (rc) goto err_stream;
-        rc = video_device_create_file(vdev, &dev_attr_frames_total);
+        rc = device_create_file(&vdev->dev, &dev_attr_frames_total);
         if (rc) goto err_pal;
-        rc = video_device_create_file(vdev, &dev_attr_frames_read);
+        rc = device_create_file(&vdev->dev, &dev_attr_frames_read);
         if (rc) goto err_framtot;
-        rc = video_device_create_file(vdev, &dev_attr_packets_dropped);
+        rc = device_create_file(&vdev->dev, &dev_attr_packets_dropped);
         if (rc) goto err_framread;
-        rc = video_device_create_file(vdev, &dev_attr_decoding_errors);
+        rc = device_create_file(&vdev->dev, &dev_attr_decoding_errors);
         if (rc) goto err_dropped;
 
         return 0;
 
 err_dropped:
-        video_device_remove_file(vdev, &dev_attr_packets_dropped);
+        device_remove_file(&vdev->dev, &dev_attr_packets_dropped);
 err_framread:
-        video_device_remove_file(vdev, &dev_attr_frames_read);
+        device_remove_file(&vdev->dev, &dev_attr_frames_read);
 err_framtot:
-        video_device_remove_file(vdev, &dev_attr_frames_total);
+        device_remove_file(&vdev->dev, &dev_attr_frames_total);
 err_pal:
-        video_device_remove_file(vdev, &dev_attr_palette);
+        device_remove_file(&vdev->dev, &dev_attr_palette);
 err_stream:
-        video_device_remove_file(vdev, &dev_attr_streaming);
+        device_remove_file(&vdev->dev, &dev_attr_streaming);
 err_inuse:
-        video_device_remove_file(vdev, &dev_attr_in_use);
+        device_remove_file(&vdev->dev, &dev_attr_in_use);
 err_model:
-        video_device_remove_file(vdev, &dev_attr_model);
+        device_remove_file(&vdev->dev, &dev_attr_model);
 err:
+        PDEBUG(0, "STV(e): Could not create sysfs files");
         return rc;
 }
 
 static void stv680_remove_sysfs_files(struct video_device *vdev)
 {
-        video_device_remove_file(vdev, &dev_attr_model);
-        video_device_remove_file(vdev, &dev_attr_in_use);
-        video_device_remove_file(vdev, &dev_attr_streaming);
-        video_device_remove_file(vdev, &dev_attr_palette);
-        video_device_remove_file(vdev, &dev_attr_frames_total);
-        video_device_remove_file(vdev, &dev_attr_frames_read);
-        video_device_remove_file(vdev, &dev_attr_packets_dropped);
-        video_device_remove_file(vdev, &dev_attr_decoding_errors);
+        device_remove_file(&vdev->dev, &dev_attr_model);
+        device_remove_file(&vdev->dev, &dev_attr_in_use);
+        device_remove_file(&vdev->dev, &dev_attr_streaming);
+        device_remove_file(&vdev->dev, &dev_attr_palette);
+        device_remove_file(&vdev->dev, &dev_attr_frames_total);
+        device_remove_file(&vdev->dev, &dev_attr_frames_read);
+        device_remove_file(&vdev->dev, &dev_attr_packets_dropped);
+        device_remove_file(&vdev->dev, &dev_attr_decoding_errors);
 }
 
 /********************************************************************
@@ -1400,9 +1402,7 @@ static const struct file_operations stv680_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device stv680_template = {
-        .owner =        THIS_MODULE,
         .name =         "STV0680 USB camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &stv680_fops,
         .release =      video_device_release,
         .minor =        -1,
@@ -1454,7 +1454,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
                 goto error;
         }
         memcpy(stv680->vdev, &stv680_template, sizeof(stv680_template));
-        stv680->vdev->dev = &intf->dev;
+        stv680->vdev->parent = &intf->dev;
         video_set_drvdata(stv680->vdev, stv680);
 
         memcpy (stv680->vdev->name, stv680->camera_name, strlen (stv680->camera_name));
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index ae75c187da79..4963d4264880 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -44,10 +44,11 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/i2c-addr.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 7a8ce8fb46dc..792f0b079909 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c
index 9220378a5637..281065b9dd2d 100644
--- a/drivers/media/video/tlv320aic23b.c
+++ b/drivers/media/video/tlv320aic23b.c
@@ -29,7 +29,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-i2c-drv-legacy.h>
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 93d879dc510f..d806a3556eed 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -19,6 +19,7 @@
 #include <media/tuner.h>
 #include <media/tuner-types.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/v4l2-i2c-drv-legacy.h>
 #include "mt20xx.h"
 #include "tda8290.h"
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 9da0e1807ffb..bcc32fa92a81 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -34,13 +34,13 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
+#include <media/v4l2-chip-ident.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
@@ -261,70 +261,72 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,                 "MaxLinear MXL5005_v2"},
         { TUNER_PHILIPS_TDA8290,        "Philips 18271_8295"},
         /* 150-159 */
-        { TUNER_ABSENT,        "Xceive XC5000"},
+        { TUNER_ABSENT,                 "Xceive XC5000"},
 };
 
+/* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are
+ * internal to a video chip, i.e. not a separate audio chip. */
 static struct HAUPPAUGE_AUDIOIC
 {
-        enum audiochip  id;
+        u32   id;
         char *name;
 }
 audioIC[] =
 {
         /* 0-4 */
-        {AUDIO_CHIP_NONE,     "None"},
-        {AUDIO_CHIP_TEA6300,  "TEA6300"},
-        {AUDIO_CHIP_TEA6300,  "TEA6320"},
-        {AUDIO_CHIP_TDA985X,  "TDA9850"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3400C"},
+        { V4L2_IDENT_NONE,      "None"      },
+        { V4L2_IDENT_UNKNOWN,   "TEA6300"   },
+        { V4L2_IDENT_UNKNOWN,   "TEA6320"   },
+        { V4L2_IDENT_UNKNOWN,   "TDA9850"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3400C"  },
         /* 5-9 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3410D"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3415"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3430"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3438"},
-        {AUDIO_CHIP_UNKNOWN,  "CS5331"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3410D"  },
+        { V4L2_IDENT_MSPX4XX,   "MSP3415"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3430"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3438"   },
+        { V4L2_IDENT_UNKNOWN,   "CS5331"    },
         /* 10-14 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3435"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3440"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3445"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3411"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3416"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3435"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3440"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3445"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3411"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3416"   },
         /* 15-19 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3425"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3451"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3418"},
-        {AUDIO_CHIP_UNKNOWN,  "Type 0x12"},
-        {AUDIO_CHIP_UNKNOWN,  "OKI7716"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3425"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3451"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3418"   },
+        { V4L2_IDENT_UNKNOWN,   "Type 0x12" },
+        { V4L2_IDENT_UNKNOWN,   "OKI7716"   },
         /* 20-24 */
-        {AUDIO_CHIP_MSP34XX,  "MSP4410"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4420"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4440"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4450"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4408"},
+        { V4L2_IDENT_MSPX4XX,   "MSP4410"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4420"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4440"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4450"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4408"   },
         /* 25-29 */
-        {AUDIO_CHIP_MSP34XX,  "MSP4418"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4428"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4448"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4458"},
-        {AUDIO_CHIP_MSP34XX,  "Type 0x1d"},
+        { V4L2_IDENT_MSPX4XX,   "MSP4418"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4428"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4448"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4458"   },
+        { V4L2_IDENT_MSPX4XX,   "Type 0x1d" },
         /* 30-34 */
-        {AUDIO_CHIP_INTERNAL, "CX880"},
-        {AUDIO_CHIP_INTERNAL, "CX881"},
-        {AUDIO_CHIP_INTERNAL, "CX883"},
-        {AUDIO_CHIP_INTERNAL, "CX882"},
-        {AUDIO_CHIP_INTERNAL, "CX25840"},
+        { V4L2_IDENT_AMBIGUOUS, "CX880"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX881"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX883"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX882"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX25840"   },
         /* 35-39 */
-        {AUDIO_CHIP_INTERNAL, "CX25841"},
-        {AUDIO_CHIP_INTERNAL, "CX25842"},
-        {AUDIO_CHIP_INTERNAL, "CX25843"},
-        {AUDIO_CHIP_INTERNAL, "CX23418"},
-        {AUDIO_CHIP_INTERNAL, "CX23885"},
+        { V4L2_IDENT_AMBIGUOUS, "CX25841"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX25842"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX25843"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23418"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23885"   },
         /* 40-44 */
-        {AUDIO_CHIP_INTERNAL, "CX23888"},
-        {AUDIO_CHIP_INTERNAL, "SAA7131"},
-        {AUDIO_CHIP_INTERNAL, "CX23887"},
-        {AUDIO_CHIP_INTERNAL, "SAA7164"},
-        {AUDIO_CHIP_INTERNAL, "AU8522"},
+        { V4L2_IDENT_AMBIGUOUS, "CX23888"   },
+        { V4L2_IDENT_AMBIGUOUS, "SAA7131"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23887"   },
+        { V4L2_IDENT_AMBIGUOUS, "SAA7164"   },
+        { V4L2_IDENT_AMBIGUOUS, "AU8522"    },
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
@@ -483,7 +485,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->has_radio = eeprom_data[i+len-1];
                         /* old style tag, don't know how to detect
                         IR presence, mark as unknown. */
-                        tvee->has_ir = -1;
+                        tvee->has_ir = 0;
                         tvee->model =
                                 eeprom_data[i+8] +
                                 (eeprom_data[i+9] << 8);
@@ -509,7 +511,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
-                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
                         break;
 
                 /* case 0x03: tag 'EEInfo' */
@@ -542,7 +544,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
-                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
 
                         break;
 
@@ -603,7 +605,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 
                 case 0x0f:
                         /* tag 'IRInfo' */
-                        tvee->has_ir = eeprom_data[i+1];
+                        tvee->has_ir = 1 | (eeprom_data[i+1] << 1);
                         break;
 
                 /* case 0x10: tag 'VBIInfo' */
@@ -690,7 +692,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         t_fmt_name2[6], t_fmt_name2[7], t_format2);
         if (audioic < 0) {
                 tveeprom_info("audio processor is unknown (no idx)\n");
-                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
         } else {
                 if (audioic < ARRAY_SIZE(audioIC))
                         tveeprom_info("audio processor is %s (idx %d)\n",
@@ -703,14 +705,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 tveeprom_info("decoder processor is %s (idx %d)\n",
                         STRM(decoderIC, tvee->decoder_processor),
                         tvee->decoder_processor);
-        if (tvee->has_ir == -1)
-                tveeprom_info("has %sradio\n",
-                                tvee->has_radio ? "" : "no ");
-        else
+        if (tvee->has_ir)
                 tveeprom_info("has %sradio, has %sIR receiver, has %sIR transmitter\n",
                                 tvee->has_radio ? "" : "no ",
-                                (tvee->has_ir & 1) ? "" : "no ",
-                                (tvee->has_ir & 2) ? "" : "no ");
+                                (tvee->has_ir & 2) ? "" : "no ",
+                                (tvee->has_ir & 4) ? "" : "no ");
+        else
+                tveeprom_info("has %sradio\n",
+                                tvee->has_radio ? "" : "no ");
 }
 EXPORT_SYMBOL(tveeprom_hauppauge_analog);
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 6a3af1005f03..28af5ce5560d 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -6,7 +6,7 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/delay.h>
 #include <linux/video_decoder.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 4128ee20b64e..bf1bc2f69b02 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -952,8 +952,6 @@ static const struct file_operations usbvideo_fops = {
         .llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {
-        .owner =      THIS_MODULE,
-        .type =       VID_TYPE_CAPTURE,
         .fops =       &usbvideo_fops,
 };
 
@@ -1040,7 +1038,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 err("%s: uvd->dev == NULL", __func__);
                 return -EINVAL;
         }
-        uvd->vdev.dev = &uvd->dev->dev;
+        uvd->vdev.parent = &uvd->dev->dev;
         if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 err("%s: video_register_device failed", __func__);
                 return -EPIPE;
diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h
index 051775d4c726..c66985beb8c9 100644
--- a/drivers/media/video/usbvideo/usbvideo.h
+++ b/drivers/media/video/usbvideo/usbvideo.h
@@ -18,6 +18,7 @@
 
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 40d053e0d5bf..b7792451a299 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -41,6 +41,7 @@
 #include <linux/videodev.h>
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/firmware.h>
@@ -791,9 +792,7 @@ static const struct file_operations vicam_fops = {
 };
 
 static struct video_device vicam_template = {
-        .owner          = THIS_MODULE,
         .name           = "ViCam-based USB Camera",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &vicam_fops,
         .minor          = -1,
 };
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index abf685464b7c..c317ed7a8482 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -30,7 +30,6 @@
 #include <linux/mm.h>
 #include <linux/utsname.h>
 #include <linux/highmem.h>
-#include <linux/videodev.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -43,7 +42,6 @@
 #include <media/saa7115.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
 
 #include <linux/workqueue.h>
 
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index cd6c41d67899..b977116a0dd9 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -53,7 +53,6 @@
 #include <linux/mm.h>
 #include <linux/utsname.h>
 #include <linux/highmem.h>
-#include <linux/videodev.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -65,8 +64,8 @@
 
 #include <media/saa7115.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
 
 #include <linux/workqueue.h>
 
@@ -184,7 +183,7 @@ MODULE_ALIAS(DRIVER_ALIAS);
 static inline struct usb_usbvision *cd_to_usbvision(struct device *cd)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         return video_get_drvdata(vdev);
 }
 
@@ -199,7 +198,7 @@ static ssize_t show_model(struct device *cd,
                           struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        usbvision_device_data[usbvision->DevModel].ModelString);
@@ -210,7 +209,7 @@ static ssize_t show_hue(struct device *cd,
                         struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_HUE;
@@ -225,7 +224,7 @@ static ssize_t show_contrast(struct device *cd,
                              struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_CONTRAST;
@@ -240,7 +239,7 @@ static ssize_t show_brightness(struct device *cd,
                                struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_BRIGHTNESS;
@@ -255,7 +254,7 @@ static ssize_t show_saturation(struct device *cd,
                                struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_SATURATION;
@@ -270,7 +269,7 @@ static ssize_t show_streaming(struct device *cd,
                               struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        YES_NO(usbvision->streaming==Stream_On?1:0));
@@ -281,7 +280,7 @@ static ssize_t show_compression(struct device *cd,
                                 struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%s\n",
                        YES_NO(usbvision->isocMode==ISOC_MODE_COMPRESS));
@@ -292,7 +291,7 @@ static ssize_t show_device_bridge(struct device *cd,
                                   struct device_attribute *attr, char *buf)
 {
         struct video_device *vdev =
-                container_of(cd, struct video_device, class_dev);
+                container_of(cd, struct video_device, dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%d\n", usbvision->bridgeType);
 }
@@ -304,40 +303,31 @@ static void usbvision_create_sysfs(struct video_device *vdev)
         if (!vdev)
                 return;
         do {
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_version);
+                res = device_create_file(&vdev->dev, &dev_attr_version);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_model);
+                res = device_create_file(&vdev->dev, &dev_attr_model);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_hue);
+                res = device_create_file(&vdev->dev, &dev_attr_hue);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_contrast);
+                res = device_create_file(&vdev->dev, &dev_attr_contrast);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_brightness);
+                res = device_create_file(&vdev->dev, &dev_attr_brightness);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_saturation);
+                res = device_create_file(&vdev->dev, &dev_attr_saturation);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_streaming);
+                res = device_create_file(&vdev->dev, &dev_attr_streaming);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_compression);
+                res = device_create_file(&vdev->dev, &dev_attr_compression);
                 if (res<0)
                         break;
-                res = device_create_file(&vdev->class_dev,
-                                         &dev_attr_bridge);
+                res = device_create_file(&vdev->dev, &dev_attr_bridge);
                 if (res>=0)
                         return;
         } while (0);
@@ -348,24 +338,15 @@ static void usbvision_create_sysfs(struct video_device *vdev)
 static void usbvision_remove_sysfs(struct video_device *vdev)
 {
         if (vdev) {
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_version);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_model);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_hue);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_contrast);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_brightness);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_saturation);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_streaming);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_compression);
-                device_remove_file(&vdev->class_dev,
-                                         &dev_attr_bridge);
+                device_remove_file(&vdev->dev, &dev_attr_version);
+                device_remove_file(&vdev->dev, &dev_attr_model);
+                device_remove_file(&vdev->dev, &dev_attr_hue);
+                device_remove_file(&vdev->dev, &dev_attr_contrast);
+                device_remove_file(&vdev->dev, &dev_attr_brightness);
+                device_remove_file(&vdev->dev, &dev_attr_saturation);
+                device_remove_file(&vdev->dev, &dev_attr_streaming);
+                device_remove_file(&vdev->dev, &dev_attr_compression);
+                device_remove_file(&vdev->dev, &dev_attr_bridge);
         }
 }
 
@@ -1388,13 +1369,8 @@ static const struct file_operations usbvision_fops = {
 /*      .poll          = video_poll, */
         .compat_ioctl  = v4l_compat_ioctl32,
 };
-static struct video_device usbvision_video_template = {
-        .owner             = THIS_MODULE,
-        .type           = VID_TYPE_TUNER | VID_TYPE_CAPTURE,
-        .fops           = &usbvision_fops,
-        .name           = "usbvision-video",
-        .release        = video_device_release,
-        .minor          = -1,
+
+static const struct v4l2_ioctl_ops usbvision_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
@@ -1426,6 +1402,14 @@ static struct video_device usbvision_video_template = {
         .vidioc_g_register    = vidioc_g_register,
         .vidioc_s_register    = vidioc_s_register,
 #endif
+};
+
+static struct video_device usbvision_video_template = {
+        .fops           = &usbvision_fops,
+        .ioctl_ops      = &usbvision_ioctl_ops,
+        .name           = "usbvision-video",
+        .release        = video_device_release,
+        .minor          = -1,
         .tvnorms              = USBVISION_NORMS,
         .current_norm         = V4L2_STD_PAL
 };
@@ -1441,14 +1425,7 @@ static const struct file_operations usbvision_radio_fops = {
         .compat_ioctl  = v4l_compat_ioctl32,
 };
 
-static struct video_device usbvision_radio_template=
-{
-        .owner             = THIS_MODULE,
-        .type           = VID_TYPE_TUNER,
-        .fops           = &usbvision_radio_fops,
-        .name           = "usbvision-radio",
-        .release        = video_device_release,
-        .minor          = -1,
+static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_input    = vidioc_enum_input,
         .vidioc_g_input       = vidioc_g_input,
@@ -1462,6 +1439,14 @@ static struct video_device usbvision_radio_template=
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_g_frequency   = vidioc_g_frequency,
         .vidioc_s_frequency   = vidioc_s_frequency,
+};
+
+static struct video_device usbvision_radio_template = {
+        .fops           = &usbvision_radio_fops,
+        .name           = "usbvision-radio",
+        .release        = video_device_release,
+        .minor          = -1,
+        .ioctl_ops      = &usbvision_radio_ioctl_ops,
 
         .tvnorms              = USBVISION_NORMS,
         .current_norm         = V4L2_STD_PAL
@@ -1479,8 +1464,6 @@ static const struct file_operations usbvision_vbi_fops = {
 
 static struct video_device usbvision_vbi_template=
 {
-        .owner             = THIS_MODULE,
-        .type           = VID_TYPE_TUNER,
         .fops           = &usbvision_vbi_fops,
         .release        = video_device_release,
         .name           = "usbvision-vbi",
@@ -1506,7 +1489,7 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
         }
         *vdev = *vdev_template;
 //      vdev->minor   = -1;
-        vdev->dev     = &usb_dev->dev;
+        vdev->parent  = &usb_dev->dev;
         snprintf(vdev->name, sizeof(vdev->name), "%s", name);
         video_set_drvdata(vdev, usbvision);
         return vdev;
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 3ae95512666f..626f4ad7e876 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -195,8 +195,8 @@ static struct uvc_menu_info power_line_frequency_controls[] = {
 };
 
 static struct uvc_menu_info exposure_auto_controls[] = {
-        { 1, "Manual Mode" },
         { 2, "Auto Mode" },
+        { 1, "Manual Mode" },
         { 4, "Shutter Priority Mode" },
         { 8, "Aperture Priority Mode" },
 };
@@ -592,6 +592,7 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,
         if (ctrl == NULL)
                 return -EINVAL;
 
+        memset(v4l2_ctrl, 0, sizeof *v4l2_ctrl);
         v4l2_ctrl->id = mapping->id;
         v4l2_ctrl->type = mapping->v4l2_type;
         strncpy(v4l2_ctrl->name, mapping->name, sizeof v4l2_ctrl->name);
@@ -608,7 +609,8 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,
                 v4l2_ctrl->default_value = uvc_get_le_value(data, mapping);
         }
 
-        if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) {
+        switch (mapping->v4l2_type) {
+        case V4L2_CTRL_TYPE_MENU:
                 v4l2_ctrl->minimum = 0;
                 v4l2_ctrl->maximum = mapping->menu_count - 1;
                 v4l2_ctrl->step = 1;
@@ -622,6 +624,15 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,
                 }
 
                 return 0;
+
+        case V4L2_CTRL_TYPE_BOOLEAN:
+                v4l2_ctrl->minimum = 0;
+                v4l2_ctrl->maximum = 1;
+                v4l2_ctrl->step = 1;
+                return 0;
+
+        default:
+                break;
         }
 
         if (ctrl->info->flags & UVC_CONTROL_GET_MIN) {
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index f2b2983fe062..b3c4d75e8490 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1458,9 +1458,7 @@ static int uvc_register_video(struct uvc_device *dev)
          * unregistered before the reference is released, so we don't need to
          * get another one.
          */
-        vdev->dev = &dev->intf->dev;
-        vdev->type = 0;
-        vdev->type2 = 0;
+        vdev->parent = &dev->intf->dev;
         vdev->minor = -1;
         vdev->fops = &uvc_fops;
         vdev->release = video_device_release;
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index b5a11eb8f9fa..d7bd71be40a9 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -23,6 +23,7 @@
 #include <asm/atomic.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "uvcvideo.h"
 
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index a0f6c60279ec..79937d1031fc 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -30,6 +30,7 @@
 #include <linux/slab.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index e9dd996fd5df..88ca13104417 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -64,7 +64,7 @@
 #include <linux/kmod.h>
 #endif
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 
 MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");
 MODULE_DESCRIPTION("misc helper functions for v4l2 device drivers");
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
new file mode 100644
index 000000000000..556615fe93de
--- /dev/null
+++ b/drivers/media/video/v4l2-dev.c
@@ -0,0 +1,422 @@
+/*
+ * Video capture interface for Linux version 2
+ *
+ *      A generic video device interface for the LINUX operating system
+ *      using a set of device structures/vectors for low level operations.
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ * Authors:     Alan Cox, <alan@redhat.com> (version 1)
+ *              Mauro Carvalho Chehab <mchehab@infradead.org> (version 2)
+ *
+ * Fixes:       20000516  Claudio Matsuoka <claudio@conectiva.com>
+ *              - Added procfs support
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kmod.h>
+#include <linux/slab.h>
+#include <linux/smp_lock.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+#include <media/v4l2-common.h>
+
+#define VIDEO_NUM_DEVICES       256
+#define VIDEO_NAME              "video4linux"
+
+/*
+ *      sysfs stuff
+ */
+
+static ssize_t show_index(struct device *cd,
+                         struct device_attribute *attr, char *buf)
+{
+        struct video_device *vfd = container_of(cd, struct video_device, dev);
+        return sprintf(buf, "%i\n", vfd->index);
+}
+
+static ssize_t show_name(struct device *cd,
+                         struct device_attribute *attr, char *buf)
+{
+        struct video_device *vfd = container_of(cd, struct video_device, dev);
+        return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
+}
+
+static struct device_attribute video_device_attrs[] = {
+        __ATTR(name, S_IRUGO, show_name, NULL),
+        __ATTR(index, S_IRUGO, show_index, NULL),
+        __ATTR_NULL
+};
+
+struct video_device *video_device_alloc(void)
+{
+        struct video_device *vfd;
+
+        vfd = kzalloc(sizeof(*vfd), GFP_KERNEL);
+        return vfd;
+}
+EXPORT_SYMBOL(video_device_alloc);
+
+void video_device_release(struct video_device *vfd)
+{
+        kfree(vfd);
+}
+EXPORT_SYMBOL(video_device_release);
+
+static void video_release(struct device *cd)
+{
+        struct video_device *vfd = container_of(cd, struct video_device, dev);
+
+#if 1
+        /* needed until all drivers are fixed */
+        if (!vfd->release)
+                return;
+#endif
+        vfd->release(vfd);
+}
+
+static struct class video_class = {
+        .name = VIDEO_NAME,
+        .dev_attrs = video_device_attrs,
+        .dev_release = video_release,
+};
+
+/*
+ *      Active devices
+ */
+
+static struct video_device *video_device[VIDEO_NUM_DEVICES];
+static DEFINE_MUTEX(videodev_lock);
+
+struct video_device *video_devdata(struct file *file)
+{
+        return video_device[iminor(file->f_path.dentry->d_inode)];
+}
+EXPORT_SYMBOL(video_devdata);
+
+/*
+ *      Open a video device - FIXME: Obsoleted
+ */
+static int video_open(struct inode *inode, struct file *file)
+{
+        unsigned int minor = iminor(inode);
+        int err = 0;
+        struct video_device *vfl;
+        const struct file_operations *old_fops;
+
+        if (minor >= VIDEO_NUM_DEVICES)
+                return -ENODEV;
+        lock_kernel();
+        mutex_lock(&videodev_lock);
+        vfl = video_device[minor];
+        if (vfl == NULL) {
+                mutex_unlock(&videodev_lock);
+                request_module("char-major-%d-%d", VIDEO_MAJOR, minor);
+                mutex_lock(&videodev_lock);
+                vfl = video_device[minor];
+                if (vfl == NULL) {
+                        mutex_unlock(&videodev_lock);
+                        unlock_kernel();
+                        return -ENODEV;
+                }
+        }
+        old_fops = file->f_op;
+        file->f_op = fops_get(vfl->fops);
+        if (file->f_op->open)
+                err = file->f_op->open(inode, file);
+        if (err) {
+                fops_put(file->f_op);
+                file->f_op = fops_get(old_fops);
+        }
+        fops_put(old_fops);
+        mutex_unlock(&videodev_lock);
+        unlock_kernel();
+        return err;
+}
+
+/*
+ * open/release helper functions -- handle exclusive opens
+ * Should be removed soon
+ */
+int video_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *vfl = video_devdata(file);
+        int retval = 0;
+
+        mutex_lock(&vfl->lock);
+        if (vfl->users)
+                retval = -EBUSY;
+        else
+                vfl->users++;
+        mutex_unlock(&vfl->lock);
+        return retval;
+}
+EXPORT_SYMBOL(video_exclusive_open);
+
+int video_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *vfl = video_devdata(file);
+
+        vfl->users--;
+        return 0;
+}
+EXPORT_SYMBOL(video_exclusive_release);
+
+/**
+ * get_index - assign stream number based on parent device
+ * @vdev: video_device to assign index number to, vdev->dev should be assigned
+ * @num: -1 if auto assign, requested number otherwise
+ *
+ *
+ * returns -ENFILE if num is already in use, a free index number if
+ * successful.
+ */
+static int get_index(struct video_device *vdev, int num)
+{
+        u32 used = 0;
+        const int max_index = sizeof(used) * 8 - 1;
+        int i;
+
+        /* Currently a single v4l driver instance cannot create more than
+           32 devices.
+           Increase to u64 or an array of u32 if more are needed. */
+        if (num > max_index) {
+                printk(KERN_ERR "videodev: %s num is too large\n", __func__);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < VIDEO_NUM_DEVICES; i++) {
+                if (video_device[i] != NULL &&
+                    video_device[i] != vdev &&
+                    video_device[i]->parent == vdev->parent) {
+                        used |= 1 << video_device[i]->index;
+                }
+        }
+
+        if (num >= 0) {
+                if (used & (1 << num))
+                        return -ENFILE;
+                return num;
+        }
+
+        i = ffz(used);
+        return i > max_index ? -ENFILE : i;
+}
+
+static const struct file_operations video_fops;
+
+int video_register_device(struct video_device *vfd, int type, int nr)
+{
+        return video_register_device_index(vfd, type, nr, -1);
+}
+EXPORT_SYMBOL(video_register_device);
+
+/**
+ *      video_register_device - register video4linux devices
+ *      @vfd:  video device structure we want to register
+ *      @type: type of device to register
+ *      @nr:   which device number (0 == /dev/video0, 1 == /dev/video1, ...
+ *             -1 == first free)
+ *
+ *      The registration code assigns minor numbers based on the type
+ *      requested. -ENFILE is returned in all the device slots for this
+ *      category are full. If not then the minor field is set and the
+ *      driver initialize function is called (if non %NULL).
+ *
+ *      Zero is returned on success.
+ *
+ *      Valid types are
+ *
+ *      %VFL_TYPE_GRABBER - A frame grabber
+ *
+ *      %VFL_TYPE_VTX - A teletext device
+ *
+ *      %VFL_TYPE_VBI - Vertical blank data (undecoded)
+ *
+ *      %VFL_TYPE_RADIO - A radio card
+ */
+
+int video_register_device_index(struct video_device *vfd, int type, int nr,
+                                        int index)
+{
+        int i = 0;
+        int base;
+        int end;
+        int ret;
+        char *name_base;
+
+        switch (type) {
+        case VFL_TYPE_GRABBER:
+                base = MINOR_VFL_TYPE_GRABBER_MIN;
+                end = MINOR_VFL_TYPE_GRABBER_MAX+1;
+                name_base = "video";
+                break;
+        case VFL_TYPE_VTX:
+                base = MINOR_VFL_TYPE_VTX_MIN;
+                end = MINOR_VFL_TYPE_VTX_MAX+1;
+                name_base = "vtx";
+                break;
+        case VFL_TYPE_VBI:
+                base = MINOR_VFL_TYPE_VBI_MIN;
+                end = MINOR_VFL_TYPE_VBI_MAX+1;
+                name_base = "vbi";
+                break;
+        case VFL_TYPE_RADIO:
+                base = MINOR_VFL_TYPE_RADIO_MIN;
+                end = MINOR_VFL_TYPE_RADIO_MAX+1;
+                name_base = "radio";
+                break;
+        default:
+                printk(KERN_ERR "%s called with unknown type: %d\n",
+                       __func__, type);
+                return -1;
+        }
+
+        /* pick a minor number */
+        mutex_lock(&videodev_lock);
+        if (nr >= 0  &&  nr < end-base) {
+                /* use the one the driver asked for */
+                i = base + nr;
+                if (NULL != video_device[i]) {
+                        mutex_unlock(&videodev_lock);
+                        return -ENFILE;
+                }
+        } else {
+                /* use first free */
+                for (i = base; i < end; i++)
+                        if (NULL == video_device[i])
+                                break;
+                if (i == end) {
+                        mutex_unlock(&videodev_lock);
+                        return -ENFILE;
+                }
+        }
+        video_device[i] = vfd;
+        vfd->vfl_type = type;
+        vfd->minor = i;
+
+        ret = get_index(vfd, index);
+        vfd->index = ret;
+
+        mutex_unlock(&videodev_lock);
+
+        if (ret < 0) {
+                printk(KERN_ERR "%s: get_index failed\n", __func__);
+                goto fail_minor;
+        }
+
+        mutex_init(&vfd->lock);
+
+        /* sysfs class */
+        memset(&vfd->dev, 0x00, sizeof(vfd->dev));
+        vfd->dev.class = &video_class;
+        vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
+        if (vfd->parent)
+                vfd->dev.parent = vfd->parent;
+        sprintf(vfd->dev.bus_id, "%s%d", name_base, i - base);
+        ret = device_register(&vfd->dev);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: device_register failed\n", __func__);
+                goto fail_minor;
+        }
+
+#if 1
+        /* needed until all drivers are fixed */
+        if (!vfd->release)
+                printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
+                       "Please fix your driver for proper sysfs support, see "
+                       "http://lwn.net/Articles/36850/\n", vfd->name);
+#endif
+        return 0;
+
+fail_minor:
+        mutex_lock(&videodev_lock);
+        video_device[vfd->minor] = NULL;
+        vfd->minor = -1;
+        mutex_unlock(&videodev_lock);
+        return ret;
+}
+EXPORT_SYMBOL(video_register_device_index);
+
+/**
+ *      video_unregister_device - unregister a video4linux device
+ *      @vfd: the device to unregister
+ *
+ *      This unregisters the passed device and deassigns the minor
+ *      number. Future open calls will be met with errors.
+ */
+
+void video_unregister_device(struct video_device *vfd)
+{
+        mutex_lock(&videodev_lock);
+        if (video_device[vfd->minor] != vfd)
+                panic("videodev: bad unregister");
+
+        video_device[vfd->minor] = NULL;
+        device_unregister(&vfd->dev);
+        mutex_unlock(&videodev_lock);
+}
+EXPORT_SYMBOL(video_unregister_device);
+
+/*
+ * Video fs operations
+ */
+static const struct file_operations video_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .open           = video_open,
+};
+
+/*
+ *      Initialise video for linux
+ */
+
+static int __init videodev_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Linux video capture interface: v2.00\n");
+        if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &video_fops)) {
+                printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);
+                return -EIO;
+        }
+
+        ret = class_register(&video_class);
+        if (ret < 0) {
+                unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+                printk(KERN_WARNING "video_dev: class_register failed\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static void __exit videodev_exit(void)
+{
+        class_unregister(&video_class);
+        unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+}
+
+module_init(videodev_init)
+module_exit(videodev_exit)
+
+MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@infradead.org>");
+MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");
+MODULE_LICENSE("GPL");
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
new file mode 100644
index 000000000000..fdfe7739c96e
--- /dev/null
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -0,0 +1,1875 @@
+/*
+ * Video capture interface for Linux version 2
+ *
+ * A generic framework to process V4L2 ioctl commands.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Authors:     Alan Cox, <alan@redhat.com> (version 1)
+ *              Mauro Carvalho Chehab <mchehab@infradead.org> (version 2)
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+#define __OLD_VIDIOC_ /* To allow fixing old calls */
+#include <linux/videodev2.h>
+
+#ifdef CONFIG_VIDEO_V4L1
+#include <linux/videodev.h>
+#endif
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <linux/video_decoder.h>
+
+#define dbgarg(cmd, fmt, arg...) \
+                do {                                                    \
+                    if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {            \
+                        printk(KERN_DEBUG "%s: ",  vfd->name);          \
+                        v4l_printk_ioctl(cmd);                          \
+                        printk(" " fmt,  ## arg);                       \
+                    }                                                   \
+                } while (0)
+
+#define dbgarg2(fmt, arg...) \
+                do {                                                    \
+                    if (vfd->debug & V4L2_DEBUG_IOCTL_ARG)              \
+                        printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\
+                } while (0)
+
+struct std_descr {
+        v4l2_std_id std;
+        const char *descr;
+};
+
+static const struct std_descr standards[] = {
+        { V4L2_STD_NTSC,        "NTSC"      },
+        { V4L2_STD_NTSC_M,      "NTSC-M"    },
+        { V4L2_STD_NTSC_M_JP,   "NTSC-M-JP" },
+        { V4L2_STD_NTSC_M_KR,   "NTSC-M-KR" },
+        { V4L2_STD_NTSC_443,    "NTSC-443"  },
+        { V4L2_STD_PAL,         "PAL"       },
+        { V4L2_STD_PAL_BG,      "PAL-BG"    },
+        { V4L2_STD_PAL_B,       "PAL-B"     },
+        { V4L2_STD_PAL_B1,      "PAL-B1"    },
+        { V4L2_STD_PAL_G,       "PAL-G"     },
+        { V4L2_STD_PAL_H,       "PAL-H"     },
+        { V4L2_STD_PAL_I,       "PAL-I"     },
+        { V4L2_STD_PAL_DK,      "PAL-DK"    },
+        { V4L2_STD_PAL_D,       "PAL-D"     },
+        { V4L2_STD_PAL_D1,      "PAL-D1"    },
+        { V4L2_STD_PAL_K,       "PAL-K"     },
+        { V4L2_STD_PAL_M,       "PAL-M"     },
+        { V4L2_STD_PAL_N,       "PAL-N"     },
+        { V4L2_STD_PAL_Nc,      "PAL-Nc"    },
+        { V4L2_STD_PAL_60,      "PAL-60"    },
+        { V4L2_STD_SECAM,       "SECAM"     },
+        { V4L2_STD_SECAM_B,     "SECAM-B"   },
+        { V4L2_STD_SECAM_G,     "SECAM-G"   },
+        { V4L2_STD_SECAM_H,     "SECAM-H"   },
+        { V4L2_STD_SECAM_DK,    "SECAM-DK"  },
+        { V4L2_STD_SECAM_D,     "SECAM-D"   },
+        { V4L2_STD_SECAM_K,     "SECAM-K"   },
+        { V4L2_STD_SECAM_K1,    "SECAM-K1"  },
+        { V4L2_STD_SECAM_L,     "SECAM-L"   },
+        { V4L2_STD_SECAM_LC,    "SECAM-Lc"  },
+        { 0,                    "Unknown"   }
+};
+
+/* video4linux standard ID conversion to standard name
+ */
+const char *v4l2_norm_to_name(v4l2_std_id id)
+{
+        u32 myid = id;
+        int i;
+
+        /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle
+           64 bit comparations. So, on that architecture, with some gcc
+           variants, compilation fails. Currently, the max value is 30bit wide.
+         */
+        BUG_ON(myid != id);
+
+        for (i = 0; standards[i].std; i++)
+                if (myid == standards[i].std)
+                        break;
+        return standards[i].descr;
+}
+EXPORT_SYMBOL(v4l2_norm_to_name);
+
+/* Fill in the fields of a v4l2_standard structure according to the
+   'id' and 'transmission' parameters.  Returns negative on error.  */
+int v4l2_video_std_construct(struct v4l2_standard *vs,
+                             int id, const char *name)
+{
+        u32 index = vs->index;
+
+        memset(vs, 0, sizeof(struct v4l2_standard));
+        vs->index = index;
+        vs->id    = id;
+        if (id & V4L2_STD_525_60) {
+                vs->frameperiod.numerator = 1001;
+                vs->frameperiod.denominator = 30000;
+                vs->framelines = 525;
+        } else {
+                vs->frameperiod.numerator = 1;
+                vs->frameperiod.denominator = 25;
+                vs->framelines = 625;
+        }
+        strlcpy(vs->name, name, sizeof(vs->name));
+        return 0;
+}
+EXPORT_SYMBOL(v4l2_video_std_construct);
+
+/* ----------------------------------------------------------------- */
+/* some arrays for pretty-printing debug messages of enum types      */
+
+const char *v4l2_field_names[] = {
+        [V4L2_FIELD_ANY]        = "any",
+        [V4L2_FIELD_NONE]       = "none",
+        [V4L2_FIELD_TOP]        = "top",
+        [V4L2_FIELD_BOTTOM]     = "bottom",
+        [V4L2_FIELD_INTERLACED] = "interlaced",
+        [V4L2_FIELD_SEQ_TB]     = "seq-tb",
+        [V4L2_FIELD_SEQ_BT]     = "seq-bt",
+        [V4L2_FIELD_ALTERNATE]  = "alternate",
+        [V4L2_FIELD_INTERLACED_TB] = "interlaced-tb",
+        [V4L2_FIELD_INTERLACED_BT] = "interlaced-bt",
+};
+EXPORT_SYMBOL(v4l2_field_names);
+
+const char *v4l2_type_names[] = {
+        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "vid-cap",
+        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "vid-overlay",
+        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "vid-out",
+        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
+        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
+        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
+        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",
+        [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "vid-out-overlay",
+};
+EXPORT_SYMBOL(v4l2_type_names);
+
+static const char *v4l2_memory_names[] = {
+        [V4L2_MEMORY_MMAP]    = "mmap",
+        [V4L2_MEMORY_USERPTR] = "userptr",
+        [V4L2_MEMORY_OVERLAY] = "overlay",
+};
+
+#define prt_names(a, arr) ((((a) >= 0) && ((a) < ARRAY_SIZE(arr))) ? \
+                           arr[a] : "unknown")
+
+/* ------------------------------------------------------------------ */
+/* debug help functions                                               */
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static const char *v4l1_ioctls[] = {
+        [_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",
+        [_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
+        [_IOC_NR(VIDIOCSCHAN)]      = "VIDIOCSCHAN",
+        [_IOC_NR(VIDIOCGTUNER)]     = "VIDIOCGTUNER",
+        [_IOC_NR(VIDIOCSTUNER)]     = "VIDIOCSTUNER",
+        [_IOC_NR(VIDIOCGPICT)]      = "VIDIOCGPICT",
+        [_IOC_NR(VIDIOCSPICT)]      = "VIDIOCSPICT",
+        [_IOC_NR(VIDIOCCAPTURE)]    = "VIDIOCCAPTURE",
+        [_IOC_NR(VIDIOCGWIN)]       = "VIDIOCGWIN",
+        [_IOC_NR(VIDIOCSWIN)]       = "VIDIOCSWIN",
+        [_IOC_NR(VIDIOCGFBUF)]      = "VIDIOCGFBUF",
+        [_IOC_NR(VIDIOCSFBUF)]      = "VIDIOCSFBUF",
+        [_IOC_NR(VIDIOCKEY)]        = "VIDIOCKEY",
+        [_IOC_NR(VIDIOCGFREQ)]      = "VIDIOCGFREQ",
+        [_IOC_NR(VIDIOCSFREQ)]      = "VIDIOCSFREQ",
+        [_IOC_NR(VIDIOCGAUDIO)]     = "VIDIOCGAUDIO",
+        [_IOC_NR(VIDIOCSAUDIO)]     = "VIDIOCSAUDIO",
+        [_IOC_NR(VIDIOCSYNC)]       = "VIDIOCSYNC",
+        [_IOC_NR(VIDIOCMCAPTURE)]   = "VIDIOCMCAPTURE",
+        [_IOC_NR(VIDIOCGMBUF)]      = "VIDIOCGMBUF",
+        [_IOC_NR(VIDIOCGUNIT)]      = "VIDIOCGUNIT",
+        [_IOC_NR(VIDIOCGCAPTURE)]   = "VIDIOCGCAPTURE",
+        [_IOC_NR(VIDIOCSCAPTURE)]   = "VIDIOCSCAPTURE",
+        [_IOC_NR(VIDIOCSPLAYMODE)]  = "VIDIOCSPLAYMODE",
+        [_IOC_NR(VIDIOCSWRITEMODE)] = "VIDIOCSWRITEMODE",
+        [_IOC_NR(VIDIOCGPLAYINFO)]  = "VIDIOCGPLAYINFO",
+        [_IOC_NR(VIDIOCSMICROCODE)] = "VIDIOCSMICROCODE",
+        [_IOC_NR(VIDIOCGVBIFMT)]    = "VIDIOCGVBIFMT",
+        [_IOC_NR(VIDIOCSVBIFMT)]    = "VIDIOCSVBIFMT"
+};
+#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
+#endif
+
+static const char *v4l2_ioctls[] = {
+        [_IOC_NR(VIDIOC_QUERYCAP)]         = "VIDIOC_QUERYCAP",
+        [_IOC_NR(VIDIOC_RESERVED)]         = "VIDIOC_RESERVED",
+        [_IOC_NR(VIDIOC_ENUM_FMT)]         = "VIDIOC_ENUM_FMT",
+        [_IOC_NR(VIDIOC_G_FMT)]            = "VIDIOC_G_FMT",
+        [_IOC_NR(VIDIOC_S_FMT)]            = "VIDIOC_S_FMT",
+        [_IOC_NR(VIDIOC_REQBUFS)]          = "VIDIOC_REQBUFS",
+        [_IOC_NR(VIDIOC_QUERYBUF)]         = "VIDIOC_QUERYBUF",
+        [_IOC_NR(VIDIOC_G_FBUF)]           = "VIDIOC_G_FBUF",
+        [_IOC_NR(VIDIOC_S_FBUF)]           = "VIDIOC_S_FBUF",
+        [_IOC_NR(VIDIOC_OVERLAY)]          = "VIDIOC_OVERLAY",
+        [_IOC_NR(VIDIOC_QBUF)]             = "VIDIOC_QBUF",
+        [_IOC_NR(VIDIOC_DQBUF)]            = "VIDIOC_DQBUF",
+        [_IOC_NR(VIDIOC_STREAMON)]         = "VIDIOC_STREAMON",
+        [_IOC_NR(VIDIOC_STREAMOFF)]        = "VIDIOC_STREAMOFF",
+        [_IOC_NR(VIDIOC_G_PARM)]           = "VIDIOC_G_PARM",
+        [_IOC_NR(VIDIOC_S_PARM)]           = "VIDIOC_S_PARM",
+        [_IOC_NR(VIDIOC_G_STD)]            = "VIDIOC_G_STD",
+        [_IOC_NR(VIDIOC_S_STD)]            = "VIDIOC_S_STD",
+        [_IOC_NR(VIDIOC_ENUMSTD)]          = "VIDIOC_ENUMSTD",
+        [_IOC_NR(VIDIOC_ENUMINPUT)]        = "VIDIOC_ENUMINPUT",
+        [_IOC_NR(VIDIOC_G_CTRL)]           = "VIDIOC_G_CTRL",
+        [_IOC_NR(VIDIOC_S_CTRL)]           = "VIDIOC_S_CTRL",
+        [_IOC_NR(VIDIOC_G_TUNER)]          = "VIDIOC_G_TUNER",
+        [_IOC_NR(VIDIOC_S_TUNER)]          = "VIDIOC_S_TUNER",
+        [_IOC_NR(VIDIOC_G_AUDIO)]          = "VIDIOC_G_AUDIO",
+        [_IOC_NR(VIDIOC_S_AUDIO)]          = "VIDIOC_S_AUDIO",
+        [_IOC_NR(VIDIOC_QUERYCTRL)]        = "VIDIOC_QUERYCTRL",
+        [_IOC_NR(VIDIOC_QUERYMENU)]        = "VIDIOC_QUERYMENU",
+        [_IOC_NR(VIDIOC_G_INPUT)]          = "VIDIOC_G_INPUT",
+        [_IOC_NR(VIDIOC_S_INPUT)]          = "VIDIOC_S_INPUT",
+        [_IOC_NR(VIDIOC_G_OUTPUT)]         = "VIDIOC_G_OUTPUT",
+        [_IOC_NR(VIDIOC_S_OUTPUT)]         = "VIDIOC_S_OUTPUT",
+        [_IOC_NR(VIDIOC_ENUMOUTPUT)]       = "VIDIOC_ENUMOUTPUT",
+        [_IOC_NR(VIDIOC_G_AUDOUT)]         = "VIDIOC_G_AUDOUT",
+        [_IOC_NR(VIDIOC_S_AUDOUT)]         = "VIDIOC_S_AUDOUT",
+        [_IOC_NR(VIDIOC_G_MODULATOR)]      = "VIDIOC_G_MODULATOR",
+        [_IOC_NR(VIDIOC_S_MODULATOR)]      = "VIDIOC_S_MODULATOR",
+        [_IOC_NR(VIDIOC_G_FREQUENCY)]      = "VIDIOC_G_FREQUENCY",
+        [_IOC_NR(VIDIOC_S_FREQUENCY)]      = "VIDIOC_S_FREQUENCY",
+        [_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",
+        [_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",
+        [_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",
+        [_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",
+        [_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",
+        [_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",
+        [_IOC_NR(VIDIOC_TRY_FMT)]          = "VIDIOC_TRY_FMT",
+        [_IOC_NR(VIDIOC_ENUMAUDIO)]        = "VIDIOC_ENUMAUDIO",
+        [_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",
+        [_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",
+        [_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",
+        [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",
+        [_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",
+        [_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",
+        [_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",
+        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",
+#if 1
+        [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
+        [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
+        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
+        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
+        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD",
+
+        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]   = "VIDIOC_DBG_S_REGISTER",
+        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]   = "VIDIOC_DBG_G_REGISTER",
+
+        [_IOC_NR(VIDIOC_G_CHIP_IDENT)]     = "VIDIOC_G_CHIP_IDENT",
+        [_IOC_NR(VIDIOC_S_HW_FREQ_SEEK)]   = "VIDIOC_S_HW_FREQ_SEEK",
+#endif
+};
+#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
+
+static const char *v4l2_int_ioctls[] = {
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        [_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",
+        [_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",
+        [_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
+        [_IOC_NR(DECODER_SET_INPUT)]           = "DECODER_SET_INPUT",
+        [_IOC_NR(DECODER_SET_OUTPUT)]          = "DECODER_SET_OUTPUT",
+        [_IOC_NR(DECODER_ENABLE_OUTPUT)]       = "DECODER_ENABLE_OUTPUT",
+        [_IOC_NR(DECODER_SET_PICTURE)]         = "DECODER_SET_PICTURE",
+        [_IOC_NR(DECODER_SET_GPIO)]            = "DECODER_SET_GPIO",
+        [_IOC_NR(DECODER_INIT)]                = "DECODER_INIT",
+        [_IOC_NR(DECODER_SET_VBI_BYPASS)]      = "DECODER_SET_VBI_BYPASS",
+        [_IOC_NR(DECODER_DUMP)]                = "DECODER_DUMP",
+#endif
+        [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
+
+        [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
+        [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
+        [_IOC_NR(TUNER_SET_CONFIG)]            = "TUNER_SET_CONFIG",
+
+        [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
+        [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
+        [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
+        [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)]  = "VIDIOC_INT_DECODE_VBI_LINE",
+        [_IOC_NR(VIDIOC_INT_S_VBI_DATA)]       = "VIDIOC_INT_S_VBI_DATA",
+        [_IOC_NR(VIDIOC_INT_G_VBI_DATA)]       = "VIDIOC_INT_G_VBI_DATA",
+        [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)]   = "VIDIOC_INT_I2S_CLOCK_FREQ",
+        [_IOC_NR(VIDIOC_INT_S_STANDBY)]        = "VIDIOC_INT_S_STANDBY",
+        [_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ",
+        [_IOC_NR(VIDIOC_INT_INIT)]             = "VIDIOC_INT_INIT",
+        [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)]     = "VIDIOC_INT_G_STD_OUTPUT",
+        [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)]     = "VIDIOC_INT_S_STD_OUTPUT",
+};
+#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
+
+/* Common ioctl debug function. This function can be used by
+   external ioctl messages as well as internal V4L ioctl */
+void v4l_printk_ioctl(unsigned int cmd)
+{
+        char *dir, *type;
+
+        switch (_IOC_TYPE(cmd)) {
+        case 'd':
+                if (_IOC_NR(cmd) >= V4L2_INT_IOCTLS) {
+                        type = "v4l2_int";
+                        break;
+                }
+                printk("%s", v4l2_int_ioctls[_IOC_NR(cmd)]);
+                return;
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        case 'v':
+                if (_IOC_NR(cmd) >= V4L1_IOCTLS) {
+                        type = "v4l1";
+                        break;
+                }
+                printk("%s", v4l1_ioctls[_IOC_NR(cmd)]);
+                return;
+#endif
+        case 'V':
+                if (_IOC_NR(cmd) >= V4L2_IOCTLS) {
+                        type = "v4l2";
+                        break;
+                }
+                printk("%s", v4l2_ioctls[_IOC_NR(cmd)]);
+                return;
+        default:
+                type = "unknown";
+        }
+
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_NONE:              dir = "--"; break;
+        case _IOC_READ:              dir = "r-"; break;
+        case _IOC_WRITE:             dir = "-w"; break;
+        case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
+        default:                     dir = "*ERR*"; break;
+        }
+        printk("%s ioctl '%c', dir=%s, #%d (0x%08x)",
+                type, _IOC_TYPE(cmd), dir, _IOC_NR(cmd), cmd);
+}
+EXPORT_SYMBOL(v4l_printk_ioctl);
+
+/*
+ * helper function -- handles userspace copying for ioctl arguments
+ */
+
+#ifdef __OLD_VIDIOC_
+static unsigned int
+video_fix_command(unsigned int cmd)
+{
+        switch (cmd) {
+        case VIDIOC_OVERLAY_OLD:
+                cmd = VIDIOC_OVERLAY;
+                break;
+        case VIDIOC_S_PARM_OLD:
+                cmd = VIDIOC_S_PARM;
+                break;
+        case VIDIOC_S_CTRL_OLD:
+                cmd = VIDIOC_S_CTRL;
+                break;
+        case VIDIOC_G_AUDIO_OLD:
+                cmd = VIDIOC_G_AUDIO;
+                break;
+        case VIDIOC_G_AUDOUT_OLD:
+                cmd = VIDIOC_G_AUDOUT;
+                break;
+        case VIDIOC_CROPCAP_OLD:
+                cmd = VIDIOC_CROPCAP;
+                break;
+        }
+        return cmd;
+}
+#endif
+
+/*
+ * Obsolete usercopy function - Should be removed soon
+ */
+int
+video_usercopy(struct inode *inode, struct file *file,
+               unsigned int cmd, unsigned long arg,
+               int (*func)(struct inode *inode, struct file *file,
+                           unsigned int cmd, void *arg))
+{
+        char    sbuf[128];
+        void    *mbuf = NULL;
+        void    *parg = NULL;
+        int     err  = -EINVAL;
+        int     is_ext_ctrl;
+        size_t  ctrls_size = 0;
+        void __user *user_ptr = NULL;
+
+#ifdef __OLD_VIDIOC_
+        cmd = video_fix_command(cmd);
+#endif
+        is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||
+                       cmd == VIDIOC_TRY_EXT_CTRLS);
+
+        /*  Copy arguments into temp kernel buffer  */
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_NONE:
+                parg = NULL;
+                break;
+        case _IOC_READ:
+        case _IOC_WRITE:
+        case (_IOC_WRITE | _IOC_READ):
+                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
+                        parg = sbuf;
+                } else {
+                        /* too big to allocate from stack */
+                        mbuf = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL);
+                        if (NULL == mbuf)
+                                return -ENOMEM;
+                        parg = mbuf;
+                }
+
+                err = -EFAULT;
+                if (_IOC_DIR(cmd) & _IOC_WRITE)
+                        if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
+                                goto out;
+                break;
+        }
+        if (is_ext_ctrl) {
+                struct v4l2_ext_controls *p = parg;
+
+                /* In case of an error, tell the caller that it wasn't
+                   a specific control that caused it. */
+                p->error_idx = p->count;
+                user_ptr = (void __user *)p->controls;
+                if (p->count) {
+                        ctrls_size = sizeof(struct v4l2_ext_control) * p->count;
+                        /* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */
+                        mbuf = kmalloc(ctrls_size, GFP_KERNEL);
+                        err = -ENOMEM;
+                        if (NULL == mbuf)
+                                goto out_ext_ctrl;
+                        err = -EFAULT;
+                        if (copy_from_user(mbuf, user_ptr, ctrls_size))
+                                goto out_ext_ctrl;
+                        p->controls = mbuf;
+                }
+        }
+
+        /* call driver */
+        err = func(inode, file, cmd, parg);
+        if (err == -ENOIOCTLCMD)
+                err = -EINVAL;
+        if (is_ext_ctrl) {
+                struct v4l2_ext_controls *p = parg;
+
+                p->controls = (void *)user_ptr;
+                if (p->count && err == 0 && copy_to_user(user_ptr, mbuf, ctrls_size))
+                        err = -EFAULT;
+                goto out_ext_ctrl;
+        }
+        if (err < 0)
+                goto out;
+
+out_ext_ctrl:
+        /*  Copy results into user buffer  */
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_READ:
+        case (_IOC_WRITE | _IOC_READ):
+                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+                        err = -EFAULT;
+                break;
+        }
+
+out:
+        kfree(mbuf);
+        return err;
+}
+EXPORT_SYMBOL(video_usercopy);
+
+static void dbgbuf(unsigned int cmd, struct video_device *vfd,
+                                        struct v4l2_buffer *p)
+{
+        struct v4l2_timecode *tc = &p->timecode;
+
+        dbgarg(cmd, "%02ld:%02d:%02d.%08ld index=%d, type=%s, "
+                "bytesused=%d, flags=0x%08d, "
+                "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx, length=%d\n",
+                        p->timestamp.tv_sec / 3600,
+                        (int)(p->timestamp.tv_sec / 60) % 60,
+                        (int)(p->timestamp.tv_sec % 60),
+                        p->timestamp.tv_usec,
+                        p->index,
+                        prt_names(p->type, v4l2_type_names),
+                        p->bytesused, p->flags,
+                        p->field, p->sequence,
+                        prt_names(p->memory, v4l2_memory_names),
+                        p->m.userptr, p->length);
+        dbgarg2("timecode=%02d:%02d:%02d type=%d, "
+                "flags=0x%08d, frames=%d, userbits=0x%08x\n",
+                        tc->hours, tc->minutes, tc->seconds,
+                        tc->type, tc->flags, tc->frames, *(__u32 *)tc->userbits);
+}
+
+static inline void dbgrect(struct video_device *vfd, char *s,
+                                                        struct v4l2_rect *r)
+{
+        dbgarg2("%sRect start at %dx%d, size=%dx%d\n", s, r->left, r->top,
+                                                r->width, r->height);
+};
+
+static inline void v4l_print_pix_fmt(struct video_device *vfd,
+                                                struct v4l2_pix_format *fmt)
+{
+        dbgarg2("width=%d, height=%d, format=%c%c%c%c, field=%s, "
+                "bytesperline=%d sizeimage=%d, colorspace=%d\n",
+                fmt->width, fmt->height,
+                (fmt->pixelformat & 0xff),
+                (fmt->pixelformat >>  8) & 0xff,
+                (fmt->pixelformat >> 16) & 0xff,
+                (fmt->pixelformat >> 24) & 0xff,
+                prt_names(fmt->field, v4l2_field_names),
+                fmt->bytesperline, fmt->sizeimage, fmt->colorspace);
+};
+
+static inline void v4l_print_ext_ctrls(unsigned int cmd,
+        struct video_device *vfd, struct v4l2_ext_controls *c, int show_vals)
+{
+        __u32 i;
+
+        if (!(vfd->debug & V4L2_DEBUG_IOCTL_ARG))
+                return;
+        dbgarg(cmd, "");
+        printk(KERN_CONT "class=0x%x", c->ctrl_class);
+        for (i = 0; i < c->count; i++) {
+                if (show_vals)
+                        printk(KERN_CONT " id/val=0x%x/0x%x",
+                                c->controls[i].id, c->controls[i].value);
+                else
+                        printk(KERN_CONT " id=0x%x", c->controls[i].id);
+        }
+        printk(KERN_CONT "\n");
+};
+
+static inline int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv)
+{
+        __u32 i;
+
+        /* zero the reserved fields */
+        c->reserved[0] = c->reserved[1] = 0;
+        for (i = 0; i < c->count; i++) {
+                c->controls[i].reserved2[0] = 0;
+                c->controls[i].reserved2[1] = 0;
+        }
+        /* V4L2_CID_PRIVATE_BASE cannot be used as control class
+           when using extended controls.
+           Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL
+           is it allowed for backwards compatibility.
+         */
+        if (!allow_priv && c->ctrl_class == V4L2_CID_PRIVATE_BASE)
+                return 0;
+        /* Check that all controls are from the same control class. */
+        for (i = 0; i < c->count; i++) {
+                if (V4L2_CTRL_ID2CLASS(c->controls[i].id) != c->ctrl_class) {
+                        c->error_idx = i;
+                        return 0;
+                }
+        }
+        return 1;
+}
+
+static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type)
+{
+        if (ops == NULL)
+                return -EINVAL;
+
+        switch (type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                if (ops->vidioc_try_fmt_vid_cap)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                if (ops->vidioc_try_fmt_vid_overlay)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                if (ops->vidioc_try_fmt_vid_out)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
+                if (ops->vidioc_try_fmt_vid_out_overlay)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_VBI_CAPTURE:
+                if (ops->vidioc_try_fmt_vbi_cap)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_VBI_OUTPUT:
+                if (ops->vidioc_try_fmt_vbi_out)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+                if (ops->vidioc_try_fmt_sliced_vbi_cap)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+                if (ops->vidioc_try_fmt_sliced_vbi_out)
+                        return 0;
+                break;
+        case V4L2_BUF_TYPE_PRIVATE:
+                if (ops->vidioc_try_fmt_type_private)
+                        return 0;
+                break;
+        }
+        return -EINVAL;
+}
+
+static int __video_do_ioctl(struct inode *inode, struct file *file,
+                unsigned int cmd, void *arg)
+{
+        struct video_device *vfd = video_devdata(file);
+        const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
+        void                 *fh = file->private_data;
+        int                  ret = -EINVAL;
+
+        if ((vfd->debug & V4L2_DEBUG_IOCTL) &&
+                                !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
+                v4l_print_ioctl(vfd->name, cmd);
+                printk(KERN_CONT "\n");
+        }
+
+        if (ops == NULL) {
+                printk(KERN_WARNING "videodev: \"%s\" has no ioctl_ops.\n",
+                                vfd->name);
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        /***********************************************************
+         Handles calls to the obsoleted V4L1 API
+         Due to the nature of VIDIOCGMBUF, each driver that supports
+         V4L1 should implement its own handler for this ioctl.
+         ***********************************************************/
+
+        /* --- streaming capture ------------------------------------- */
+        if (cmd == VIDIOCGMBUF) {
+                struct video_mbuf *p = arg;
+
+                memset(p, 0, sizeof(*p));
+
+                if (!ops->vidiocgmbuf)
+                        return ret;
+                ret = ops->vidiocgmbuf(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "size=%d, frames=%d, offsets=0x%08lx\n",
+                                                p->size, p->frames,
+                                                (unsigned long)p->offsets);
+                return ret;
+        }
+
+        /********************************************************
+         All other V4L1 calls are handled by v4l1_compat module.
+         Those calls will be translated into V4L2 calls, and
+         __video_do_ioctl will be called again, with one or more
+         V4L2 ioctls.
+         ********************************************************/
+        if (_IOC_TYPE(cmd) == 'v')
+                return v4l_compat_translate_ioctl(inode, file, cmd, arg,
+                                                __video_do_ioctl);
+#endif
+
+        switch (cmd) {
+        /* --- capabilities ------------------------------------------ */
+        case VIDIOC_QUERYCAP:
+        {
+                struct v4l2_capability *cap = (struct v4l2_capability *)arg;
+                memset(cap, 0, sizeof(*cap));
+
+                if (!ops->vidioc_querycap)
+                        break;
+
+                ret = ops->vidioc_querycap(file, fh, cap);
+                if (!ret)
+                        dbgarg(cmd, "driver=%s, card=%s, bus=%s, "
+                                        "version=0x%08x, "
+                                        "capabilities=0x%08x\n",
+                                        cap->driver, cap->card, cap->bus_info,
+                                        cap->version,
+                                        cap->capabilities);
+                break;
+        }
+
+        /* --- priority ------------------------------------------ */
+        case VIDIOC_G_PRIORITY:
+        {
+                enum v4l2_priority *p = arg;
+
+                if (!ops->vidioc_g_priority)
+                        break;
+                ret = ops->vidioc_g_priority(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "priority is %d\n", *p);
+                break;
+        }
+        case VIDIOC_S_PRIORITY:
+        {
+                enum v4l2_priority *p = arg;
+
+                if (!ops->vidioc_s_priority)
+                        break;
+                dbgarg(cmd, "setting priority to %d\n", *p);
+                ret = ops->vidioc_s_priority(file, fh, *p);
+                break;
+        }
+
+        /* --- capture ioctls ---------------------------------------- */
+        case VIDIOC_ENUM_FMT:
+        {
+                struct v4l2_fmtdesc *f = arg;
+                enum v4l2_buf_type type;
+                unsigned int index;
+
+                index = f->index;
+                type  = f->type;
+                memset(f, 0, sizeof(*f));
+                f->index = index;
+                f->type  = type;
+
+                switch (type) {
+                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                        if (ops->vidioc_enum_fmt_vid_cap)
+                                ret = ops->vidioc_enum_fmt_vid_cap(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                        if (ops->vidioc_enum_fmt_vid_overlay)
+                                ret = ops->vidioc_enum_fmt_vid_overlay(file,
+                                        fh, f);
+                        break;
+#if 1
+                /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT
+                 * according to the spec. The bttv and saa7134 drivers support
+                 * it though, so just warn that this is deprecated and will be
+                 * removed in the near future. */
+                case V4L2_BUF_TYPE_VBI_CAPTURE:
+                        if (ops->vidioc_enum_fmt_vbi_cap) {
+                                printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");
+                                ret = ops->vidioc_enum_fmt_vbi_cap(file, fh, f);
+                        }
+                        break;
+#endif
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                        if (ops->vidioc_enum_fmt_vid_out)
+                                ret = ops->vidioc_enum_fmt_vid_out(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_PRIVATE:
+                        if (ops->vidioc_enum_fmt_type_private)
+                                ret = ops->vidioc_enum_fmt_type_private(file,
+                                                                fh, f);
+                        break;
+                default:
+                        break;
+                }
+                if (!ret)
+                        dbgarg(cmd, "index=%d, type=%d, flags=%d, "
+                                "pixelformat=%c%c%c%c, description='%s'\n",
+                                f->index, f->type, f->flags,
+                                (f->pixelformat & 0xff),
+                                (f->pixelformat >>  8) & 0xff,
+                                (f->pixelformat >> 16) & 0xff,
+                                (f->pixelformat >> 24) & 0xff,
+                                f->description);
+                break;
+        }
+        case VIDIOC_G_FMT:
+        {
+                struct v4l2_format *f = (struct v4l2_format *)arg;
+
+                memset(f->fmt.raw_data, 0, sizeof(f->fmt.raw_data));
+
+                /* FIXME: Should be one dump per type */
+                dbgarg(cmd, "type=%s\n", prt_names(f->type, v4l2_type_names));
+
+                switch (f->type) {
+                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                        if (ops->vidioc_g_fmt_vid_cap)
+                                ret = ops->vidioc_g_fmt_vid_cap(file, fh, f);
+                        if (!ret)
+                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                        if (ops->vidioc_g_fmt_vid_overlay)
+                                ret = ops->vidioc_g_fmt_vid_overlay(file,
+                                                                    fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                        if (ops->vidioc_g_fmt_vid_out)
+                                ret = ops->vidioc_g_fmt_vid_out(file, fh, f);
+                        if (!ret)
+                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
+                        if (ops->vidioc_g_fmt_vid_out_overlay)
+                                ret = ops->vidioc_g_fmt_vid_out_overlay(file,
+                                       fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_CAPTURE:
+                        if (ops->vidioc_g_fmt_vbi_cap)
+                                ret = ops->vidioc_g_fmt_vbi_cap(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_OUTPUT:
+                        if (ops->vidioc_g_fmt_vbi_out)
+                                ret = ops->vidioc_g_fmt_vbi_out(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+                        if (ops->vidioc_g_fmt_sliced_vbi_cap)
+                                ret = ops->vidioc_g_fmt_sliced_vbi_cap(file,
+                                                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+                        if (ops->vidioc_g_fmt_sliced_vbi_out)
+                                ret = ops->vidioc_g_fmt_sliced_vbi_out(file,
+                                                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_PRIVATE:
+                        if (ops->vidioc_g_fmt_type_private)
+                                ret = ops->vidioc_g_fmt_type_private(file,
+                                                                fh, f);
+                        break;
+                }
+
+                break;
+        }
+        case VIDIOC_S_FMT:
+        {
+                struct v4l2_format *f = (struct v4l2_format *)arg;
+
+                /* FIXME: Should be one dump per type */
+                dbgarg(cmd, "type=%s\n", prt_names(f->type, v4l2_type_names));
+
+                switch (f->type) {
+                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                        v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        if (ops->vidioc_s_fmt_vid_cap)
+                                ret = ops->vidioc_s_fmt_vid_cap(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                        if (ops->vidioc_s_fmt_vid_overlay)
+                                ret = ops->vidioc_s_fmt_vid_overlay(file,
+                                                                    fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                        v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        if (ops->vidioc_s_fmt_vid_out)
+                                ret = ops->vidioc_s_fmt_vid_out(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
+                        if (ops->vidioc_s_fmt_vid_out_overlay)
+                                ret = ops->vidioc_s_fmt_vid_out_overlay(file,
+                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_CAPTURE:
+                        if (ops->vidioc_s_fmt_vbi_cap)
+                                ret = ops->vidioc_s_fmt_vbi_cap(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_OUTPUT:
+                        if (ops->vidioc_s_fmt_vbi_out)
+                                ret = ops->vidioc_s_fmt_vbi_out(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+                        if (ops->vidioc_s_fmt_sliced_vbi_cap)
+                                ret = ops->vidioc_s_fmt_sliced_vbi_cap(file,
+                                                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+                        if (ops->vidioc_s_fmt_sliced_vbi_out)
+                                ret = ops->vidioc_s_fmt_sliced_vbi_out(file,
+                                                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_PRIVATE:
+                        if (ops->vidioc_s_fmt_type_private)
+                                ret = ops->vidioc_s_fmt_type_private(file,
+                                                                fh, f);
+                        break;
+                }
+                break;
+        }
+        case VIDIOC_TRY_FMT:
+        {
+                struct v4l2_format *f = (struct v4l2_format *)arg;
+
+                /* FIXME: Should be one dump per type */
+                dbgarg(cmd, "type=%s\n", prt_names(f->type,
+                                                v4l2_type_names));
+                switch (f->type) {
+                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                        if (ops->vidioc_try_fmt_vid_cap)
+                                ret = ops->vidioc_try_fmt_vid_cap(file, fh, f);
+                        if (!ret)
+                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+                        if (ops->vidioc_try_fmt_vid_overlay)
+                                ret = ops->vidioc_try_fmt_vid_overlay(file,
+                                        fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                        if (ops->vidioc_try_fmt_vid_out)
+                                ret = ops->vidioc_try_fmt_vid_out(file, fh, f);
+                        if (!ret)
+                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
+                        break;
+                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
+                        if (ops->vidioc_try_fmt_vid_out_overlay)
+                                ret = ops->vidioc_try_fmt_vid_out_overlay(file,
+                                       fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_CAPTURE:
+                        if (ops->vidioc_try_fmt_vbi_cap)
+                                ret = ops->vidioc_try_fmt_vbi_cap(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_VBI_OUTPUT:
+                        if (ops->vidioc_try_fmt_vbi_out)
+                                ret = ops->vidioc_try_fmt_vbi_out(file, fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+                        if (ops->vidioc_try_fmt_sliced_vbi_cap)
+                                ret = ops->vidioc_try_fmt_sliced_vbi_cap(file,
+                                                                fh, f);
+                        break;
+                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+                        if (ops->vidioc_try_fmt_sliced_vbi_out)
+                                ret = ops->vidioc_try_fmt_sliced_vbi_out(file,
+                                                                fh, f);
+                        break;
+                case V4L2_BUF_TYPE_PRIVATE:
+                        if (ops->vidioc_try_fmt_type_private)
+                                ret = ops->vidioc_try_fmt_type_private(file,
+                                                                fh, f);
+                        break;
+                }
+
+                break;
+        }
+        /* FIXME: Those buf reqs could be handled here,
+           with some changes on videobuf to allow its header to be included at
+           videodev2.h or being merged at videodev2.
+         */
+        case VIDIOC_REQBUFS:
+        {
+                struct v4l2_requestbuffers *p = arg;
+
+                if (!ops->vidioc_reqbufs)
+                        break;
+                ret = check_fmt(ops, p->type);
+                if (ret)
+                        break;
+
+                ret = ops->vidioc_reqbufs(file, fh, p);
+                dbgarg(cmd, "count=%d, type=%s, memory=%s\n",
+                                p->count,
+                                prt_names(p->type, v4l2_type_names),
+                                prt_names(p->memory, v4l2_memory_names));
+                break;
+        }
+        case VIDIOC_QUERYBUF:
+        {
+                struct v4l2_buffer *p = arg;
+
+                if (!ops->vidioc_querybuf)
+                        break;
+                ret = check_fmt(ops, p->type);
+                if (ret)
+                        break;
+
+                ret = ops->vidioc_querybuf(file, fh, p);
+                if (!ret)
+                        dbgbuf(cmd, vfd, p);
+                break;
+        }
+        case VIDIOC_QBUF:
+        {
+                struct v4l2_buffer *p = arg;
+
+                if (!ops->vidioc_qbuf)
+                        break;
+                ret = check_fmt(ops, p->type);
+                if (ret)
+                        break;
+
+                ret = ops->vidioc_qbuf(file, fh, p);
+                if (!ret)
+                        dbgbuf(cmd, vfd, p);
+                break;
+        }
+        case VIDIOC_DQBUF:
+        {
+                struct v4l2_buffer *p = arg;
+
+                if (!ops->vidioc_dqbuf)
+                        break;
+                ret = check_fmt(ops, p->type);
+                if (ret)
+                        break;
+
+                ret = ops->vidioc_dqbuf(file, fh, p);
+                if (!ret)
+                        dbgbuf(cmd, vfd, p);
+                break;
+        }
+        case VIDIOC_OVERLAY:
+        {
+                int *i = arg;
+
+                if (!ops->vidioc_overlay)
+                        break;
+                dbgarg(cmd, "value=%d\n", *i);
+                ret = ops->vidioc_overlay(file, fh, *i);
+                break;
+        }
+        case VIDIOC_G_FBUF:
+        {
+                struct v4l2_framebuffer *p = arg;
+
+                if (!ops->vidioc_g_fbuf)
+                        break;
+                ret = ops->vidioc_g_fbuf(file, fh, arg);
+                if (!ret) {
+                        dbgarg(cmd, "capability=0x%x, flags=%d, base=0x%08lx\n",
+                                        p->capability, p->flags,
+                                        (unsigned long)p->base);
+                        v4l_print_pix_fmt(vfd, &p->fmt);
+                }
+                break;
+        }
+        case VIDIOC_S_FBUF:
+        {
+                struct v4l2_framebuffer *p = arg;
+
+                if (!ops->vidioc_s_fbuf)
+                        break;
+                dbgarg(cmd, "capability=0x%x, flags=%d, base=0x%08lx\n",
+                        p->capability, p->flags, (unsigned long)p->base);
+                v4l_print_pix_fmt(vfd, &p->fmt);
+                ret = ops->vidioc_s_fbuf(file, fh, arg);
+                break;
+        }
+        case VIDIOC_STREAMON:
+        {
+                enum v4l2_buf_type i = *(int *)arg;
+
+                if (!ops->vidioc_streamon)
+                        break;
+                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
+                ret = ops->vidioc_streamon(file, fh, i);
+                break;
+        }
+        case VIDIOC_STREAMOFF:
+        {
+                enum v4l2_buf_type i = *(int *)arg;
+
+                if (!ops->vidioc_streamoff)
+                        break;
+                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
+                ret = ops->vidioc_streamoff(file, fh, i);
+                break;
+        }
+        /* ---------- tv norms ---------- */
+        case VIDIOC_ENUMSTD:
+        {
+                struct v4l2_standard *p = arg;
+                v4l2_std_id id = vfd->tvnorms, curr_id = 0;
+                unsigned int index = p->index, i, j = 0;
+                const char *descr = "";
+
+                /* Return norm array in a canonical way */
+                for (i = 0; i <= index && id; i++) {
+                        /* last std value in the standards array is 0, so this
+                           while always ends there since (id & 0) == 0. */
+                        while ((id & standards[j].std) != standards[j].std)
+                                j++;
+                        curr_id = standards[j].std;
+                        descr = standards[j].descr;
+                        j++;
+                        if (curr_id == 0)
+                                break;
+                        if (curr_id != V4L2_STD_PAL &&
+                            curr_id != V4L2_STD_SECAM &&
+                            curr_id != V4L2_STD_NTSC)
+                                id &= ~curr_id;
+                }
+                if (i <= index)
+                        return -EINVAL;
+
+                v4l2_video_std_construct(p, curr_id, descr);
+                p->index = index;
+
+                dbgarg(cmd, "index=%d, id=0x%Lx, name=%s, fps=%d/%d, "
+                                "framelines=%d\n", p->index,
+                                (unsigned long long)p->id, p->name,
+                                p->frameperiod.numerator,
+                                p->frameperiod.denominator,
+                                p->framelines);
+
+                ret = 0;
+                break;
+        }
+        case VIDIOC_G_STD:
+        {
+                v4l2_std_id *id = arg;
+
+                ret = 0;
+                /* Calls the specific handler */
+                if (ops->vidioc_g_std)
+                        ret = ops->vidioc_g_std(file, fh, id);
+                else
+                        *id = vfd->current_norm;
+
+                if (!ret)
+                        dbgarg(cmd, "std=0x%08Lx\n", (long long unsigned)*id);
+                break;
+        }
+        case VIDIOC_S_STD:
+        {
+                v4l2_std_id *id = arg, norm;
+
+                dbgarg(cmd, "std=%08Lx\n", (long long unsigned)*id);
+
+                norm = (*id) & vfd->tvnorms;
+                if (vfd->tvnorms && !norm)      /* Check if std is supported */
+                        break;
+
+                /* Calls the specific handler */
+                if (ops->vidioc_s_std)
+                        ret = ops->vidioc_s_std(file, fh, &norm);
+                else
+                        ret = -EINVAL;
+
+                /* Updates standard information */
+                if (ret >= 0)
+                        vfd->current_norm = norm;
+                break;
+        }
+        case VIDIOC_QUERYSTD:
+        {
+                v4l2_std_id *p = arg;
+
+                if (!ops->vidioc_querystd)
+                        break;
+                ret = ops->vidioc_querystd(file, fh, arg);
+                if (!ret)
+                        dbgarg(cmd, "detected std=%08Lx\n",
+                                                (unsigned long long)*p);
+                break;
+        }
+        /* ------ input switching ---------- */
+        /* FIXME: Inputs can be handled inside videodev2 */
+        case VIDIOC_ENUMINPUT:
+        {
+                struct v4l2_input *p = arg;
+                int i = p->index;
+
+                if (!ops->vidioc_enum_input)
+                        break;
+                memset(p, 0, sizeof(*p));
+                p->index = i;
+
+                ret = ops->vidioc_enum_input(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, type=%d, "
+                                "audioset=%d, "
+                                "tuner=%d, std=%08Lx, status=%d\n",
+                                p->index, p->name, p->type, p->audioset,
+                                p->tuner,
+                                (unsigned long long)p->std,
+                                p->status);
+                break;
+        }
+        case VIDIOC_G_INPUT:
+        {
+                unsigned int *i = arg;
+
+                if (!ops->vidioc_g_input)
+                        break;
+                ret = ops->vidioc_g_input(file, fh, i);
+                if (!ret)
+                        dbgarg(cmd, "value=%d\n", *i);
+                break;
+        }
+        case VIDIOC_S_INPUT:
+        {
+                unsigned int *i = arg;
+
+                if (!ops->vidioc_s_input)
+                        break;
+                dbgarg(cmd, "value=%d\n", *i);
+                ret = ops->vidioc_s_input(file, fh, *i);
+                break;
+        }
+
+        /* ------ output switching ---------- */
+        case VIDIOC_ENUMOUTPUT:
+        {
+                struct v4l2_output *p = arg;
+                int i = p->index;
+
+                if (!ops->vidioc_enum_output)
+                        break;
+                memset(p, 0, sizeof(*p));
+                p->index = i;
+
+                ret = ops->vidioc_enum_output(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, type=%d, "
+                                "audioset=0x%x, "
+                                "modulator=%d, std=0x%08Lx\n",
+                                p->index, p->name, p->type, p->audioset,
+                                p->modulator, (unsigned long long)p->std);
+                break;
+        }
+        case VIDIOC_G_OUTPUT:
+        {
+                unsigned int *i = arg;
+
+                if (!ops->vidioc_g_output)
+                        break;
+                ret = ops->vidioc_g_output(file, fh, i);
+                if (!ret)
+                        dbgarg(cmd, "value=%d\n", *i);
+                break;
+        }
+        case VIDIOC_S_OUTPUT:
+        {
+                unsigned int *i = arg;
+
+                if (!ops->vidioc_s_output)
+                        break;
+                dbgarg(cmd, "value=%d\n", *i);
+                ret = ops->vidioc_s_output(file, fh, *i);
+                break;
+        }
+
+        /* --- controls ---------------------------------------------- */
+        case VIDIOC_QUERYCTRL:
+        {
+                struct v4l2_queryctrl *p = arg;
+
+                if (!ops->vidioc_queryctrl)
+                        break;
+                ret = ops->vidioc_queryctrl(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "id=0x%x, type=%d, name=%s, min/max=%d/%d, "
+                                        "step=%d, default=%d, flags=0x%08x\n",
+                                        p->id, p->type, p->name,
+                                        p->minimum, p->maximum,
+                                        p->step, p->default_value, p->flags);
+                else
+                        dbgarg(cmd, "id=0x%x\n", p->id);
+                break;
+        }
+        case VIDIOC_G_CTRL:
+        {
+                struct v4l2_control *p = arg;
+
+                if (ops->vidioc_g_ctrl)
+                        ret = ops->vidioc_g_ctrl(file, fh, p);
+                else if (ops->vidioc_g_ext_ctrls) {
+                        struct v4l2_ext_controls ctrls;
+                        struct v4l2_ext_control ctrl;
+
+                        ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);
+                        ctrls.count = 1;
+                        ctrls.controls = &ctrl;
+                        ctrl.id = p->id;
+                        ctrl.value = p->value;
+                        if (check_ext_ctrls(&ctrls, 1)) {
+                                ret = ops->vidioc_g_ext_ctrls(file, fh, &ctrls);
+                                if (ret == 0)
+                                        p->value = ctrl.value;
+                        }
+                } else
+                        break;
+                if (!ret)
+                        dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
+                else
+                        dbgarg(cmd, "id=0x%x\n", p->id);
+                break;
+        }
+        case VIDIOC_S_CTRL:
+        {
+                struct v4l2_control *p = arg;
+                struct v4l2_ext_controls ctrls;
+                struct v4l2_ext_control ctrl;
+
+                if (!ops->vidioc_s_ctrl && !ops->vidioc_s_ext_ctrls)
+                        break;
+
+                dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
+
+                if (ops->vidioc_s_ctrl) {
+                        ret = ops->vidioc_s_ctrl(file, fh, p);
+                        break;
+                }
+                if (!ops->vidioc_s_ext_ctrls)
+                        break;
+
+                ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);
+                ctrls.count = 1;
+                ctrls.controls = &ctrl;
+                ctrl.id = p->id;
+                ctrl.value = p->value;
+                if (check_ext_ctrls(&ctrls, 1))
+                        ret = ops->vidioc_s_ext_ctrls(file, fh, &ctrls);
+                break;
+        }
+        case VIDIOC_G_EXT_CTRLS:
+        {
+                struct v4l2_ext_controls *p = arg;
+
+                p->error_idx = p->count;
+                if (!ops->vidioc_g_ext_ctrls)
+                        break;
+                if (check_ext_ctrls(p, 0))
+                        ret = ops->vidioc_g_ext_ctrls(file, fh, p);
+                v4l_print_ext_ctrls(cmd, vfd, p, !ret);
+                break;
+        }
+        case VIDIOC_S_EXT_CTRLS:
+        {
+                struct v4l2_ext_controls *p = arg;
+
+                p->error_idx = p->count;
+                if (!ops->vidioc_s_ext_ctrls)
+                        break;
+                v4l_print_ext_ctrls(cmd, vfd, p, 1);
+                if (check_ext_ctrls(p, 0))
+                        ret = ops->vidioc_s_ext_ctrls(file, fh, p);
+                break;
+        }
+        case VIDIOC_TRY_EXT_CTRLS:
+        {
+                struct v4l2_ext_controls *p = arg;
+
+                p->error_idx = p->count;
+                if (!ops->vidioc_try_ext_ctrls)
+                        break;
+                v4l_print_ext_ctrls(cmd, vfd, p, 1);
+                if (check_ext_ctrls(p, 0))
+                        ret = ops->vidioc_try_ext_ctrls(file, fh, p);
+                break;
+        }
+        case VIDIOC_QUERYMENU:
+        {
+                struct v4l2_querymenu *p = arg;
+
+                if (!ops->vidioc_querymenu)
+                        break;
+                ret = ops->vidioc_querymenu(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "id=0x%x, index=%d, name=%s\n",
+                                p->id, p->index, p->name);
+                else
+                        dbgarg(cmd, "id=0x%x, index=%d\n",
+                                p->id, p->index);
+                break;
+        }
+        /* --- audio ---------------------------------------------- */
+        case VIDIOC_ENUMAUDIO:
+        {
+                struct v4l2_audio *p = arg;
+
+                if (!ops->vidioc_enumaudio)
+                        break;
+                ret = ops->vidioc_enumaudio(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
+                                        "mode=0x%x\n", p->index, p->name,
+                                        p->capability, p->mode);
+                else
+                        dbgarg(cmd, "index=%d\n", p->index);
+                break;
+        }
+        case VIDIOC_G_AUDIO:
+        {
+                struct v4l2_audio *p = arg;
+                __u32 index = p->index;
+
+                if (!ops->vidioc_g_audio)
+                        break;
+
+                memset(p, 0, sizeof(*p));
+                p->index = index;
+                ret = ops->vidioc_g_audio(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
+                                        "mode=0x%x\n", p->index,
+                                        p->name, p->capability, p->mode);
+                else
+                        dbgarg(cmd, "index=%d\n", p->index);
+                break;
+        }
+        case VIDIOC_S_AUDIO:
+        {
+                struct v4l2_audio *p = arg;
+
+                if (!ops->vidioc_s_audio)
+                        break;
+                dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
+                                        "mode=0x%x\n", p->index, p->name,
+                                        p->capability, p->mode);
+                ret = ops->vidioc_s_audio(file, fh, p);
+                break;
+        }
+        case VIDIOC_ENUMAUDOUT:
+        {
+                struct v4l2_audioout *p = arg;
+
+                if (!ops->vidioc_enumaudout)
+                        break;
+                dbgarg(cmd, "Enum for index=%d\n", p->index);
+                ret = ops->vidioc_enumaudout(file, fh, p);
+                if (!ret)
+                        dbgarg2("index=%d, name=%s, capability=%d, "
+                                        "mode=%d\n", p->index, p->name,
+                                        p->capability, p->mode);
+                break;
+        }
+        case VIDIOC_G_AUDOUT:
+        {
+                struct v4l2_audioout *p = arg;
+
+                if (!ops->vidioc_g_audout)
+                        break;
+                dbgarg(cmd, "Enum for index=%d\n", p->index);
+                ret = ops->vidioc_g_audout(file, fh, p);
+                if (!ret)
+                        dbgarg2("index=%d, name=%s, capability=%d, "
+                                        "mode=%d\n", p->index, p->name,
+                                        p->capability, p->mode);
+                break;
+        }
+        case VIDIOC_S_AUDOUT:
+        {
+                struct v4l2_audioout *p = arg;
+
+                if (!ops->vidioc_s_audout)
+                        break;
+                dbgarg(cmd, "index=%d, name=%s, capability=%d, "
+                                        "mode=%d\n", p->index, p->name,
+                                        p->capability, p->mode);
+
+                ret = ops->vidioc_s_audout(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_MODULATOR:
+        {
+                struct v4l2_modulator *p = arg;
+
+                if (!ops->vidioc_g_modulator)
+                        break;
+                ret = ops->vidioc_g_modulator(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, "
+                                        "capability=%d, rangelow=%d,"
+                                        " rangehigh=%d, txsubchans=%d\n",
+                                        p->index, p->name, p->capability,
+                                        p->rangelow, p->rangehigh,
+                                        p->txsubchans);
+                break;
+        }
+        case VIDIOC_S_MODULATOR:
+        {
+                struct v4l2_modulator *p = arg;
+
+                if (!ops->vidioc_s_modulator)
+                        break;
+                dbgarg(cmd, "index=%d, name=%s, capability=%d, "
+                                "rangelow=%d, rangehigh=%d, txsubchans=%d\n",
+                                p->index, p->name, p->capability, p->rangelow,
+                                p->rangehigh, p->txsubchans);
+                        ret = ops->vidioc_s_modulator(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_CROP:
+        {
+                struct v4l2_crop *p = arg;
+
+                if (!ops->vidioc_g_crop)
+                        break;
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+                ret = ops->vidioc_g_crop(file, fh, p);
+                if (!ret)
+                        dbgrect(vfd, "", &p->c);
+                break;
+        }
+        case VIDIOC_S_CROP:
+        {
+                struct v4l2_crop *p = arg;
+
+                if (!ops->vidioc_s_crop)
+                        break;
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+                dbgrect(vfd, "", &p->c);
+                ret = ops->vidioc_s_crop(file, fh, p);
+                break;
+        }
+        case VIDIOC_CROPCAP:
+        {
+                struct v4l2_cropcap *p = arg;
+
+                /*FIXME: Should also show v4l2_fract pixelaspect */
+                if (!ops->vidioc_cropcap)
+                        break;
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+                ret = ops->vidioc_cropcap(file, fh, p);
+                if (!ret) {
+                        dbgrect(vfd, "bounds ", &p->bounds);
+                        dbgrect(vfd, "defrect ", &p->defrect);
+                }
+                break;
+        }
+        case VIDIOC_G_JPEGCOMP:
+        {
+                struct v4l2_jpegcompression *p = arg;
+
+                if (!ops->vidioc_g_jpegcomp)
+                        break;
+                ret = ops->vidioc_g_jpegcomp(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "quality=%d, APPn=%d, "
+                                        "APP_len=%d, COM_len=%d, "
+                                        "jpeg_markers=%d\n",
+                                        p->quality, p->APPn, p->APP_len,
+                                        p->COM_len, p->jpeg_markers);
+                break;
+        }
+        case VIDIOC_S_JPEGCOMP:
+        {
+                struct v4l2_jpegcompression *p = arg;
+
+                if (!ops->vidioc_g_jpegcomp)
+                        break;
+                dbgarg(cmd, "quality=%d, APPn=%d, APP_len=%d, "
+                                        "COM_len=%d, jpeg_markers=%d\n",
+                                        p->quality, p->APPn, p->APP_len,
+                                        p->COM_len, p->jpeg_markers);
+                        ret = ops->vidioc_s_jpegcomp(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_ENC_INDEX:
+        {
+                struct v4l2_enc_idx *p = arg;
+
+                if (!ops->vidioc_g_enc_index)
+                        break;
+                ret = ops->vidioc_g_enc_index(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "entries=%d, entries_cap=%d\n",
+                                        p->entries, p->entries_cap);
+                break;
+        }
+        case VIDIOC_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p = arg;
+
+                if (!ops->vidioc_encoder_cmd)
+                        break;
+                memset(&p->raw, 0, sizeof(p->raw));
+                ret = ops->vidioc_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags);
+                break;
+        }
+        case VIDIOC_TRY_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p = arg;
+
+                if (!ops->vidioc_try_encoder_cmd)
+                        break;
+                memset(&p->raw, 0, sizeof(p->raw));
+                ret = ops->vidioc_try_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags);
+                break;
+        }
+        case VIDIOC_G_PARM:
+        {
+                struct v4l2_streamparm *p = arg;
+                __u32 type = p->type;
+
+                memset(p, 0, sizeof(*p));
+                p->type = type;
+
+                if (ops->vidioc_g_parm) {
+                        ret = ops->vidioc_g_parm(file, fh, p);
+                } else {
+                        struct v4l2_standard s;
+
+                        if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                                return -EINVAL;
+
+                        v4l2_video_std_construct(&s, vfd->current_norm,
+                                                 v4l2_norm_to_name(vfd->current_norm));
+
+                        p->parm.capture.timeperframe = s.frameperiod;
+                        ret = 0;
+                }
+
+                dbgarg(cmd, "type=%d\n", p->type);
+                break;
+        }
+        case VIDIOC_S_PARM:
+        {
+                struct v4l2_streamparm *p = arg;
+
+                if (!ops->vidioc_s_parm)
+                        break;
+                dbgarg(cmd, "type=%d\n", p->type);
+                ret = ops->vidioc_s_parm(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_TUNER:
+        {
+                struct v4l2_tuner *p = arg;
+                __u32 index = p->index;
+
+                if (!ops->vidioc_g_tuner)
+                        break;
+
+                memset(p, 0, sizeof(*p));
+                p->index = index;
+
+                ret = ops->vidioc_g_tuner(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "index=%d, name=%s, type=%d, "
+                                        "capability=0x%x, rangelow=%d, "
+                                        "rangehigh=%d, signal=%d, afc=%d, "
+                                        "rxsubchans=0x%x, audmode=%d\n",
+                                        p->index, p->name, p->type,
+                                        p->capability, p->rangelow,
+                                        p->rangehigh, p->signal, p->afc,
+                                        p->rxsubchans, p->audmode);
+                break;
+        }
+        case VIDIOC_S_TUNER:
+        {
+                struct v4l2_tuner *p = arg;
+
+                if (!ops->vidioc_s_tuner)
+                        break;
+                dbgarg(cmd, "index=%d, name=%s, type=%d, "
+                                "capability=0x%x, rangelow=%d, "
+                                "rangehigh=%d, signal=%d, afc=%d, "
+                                "rxsubchans=0x%x, audmode=%d\n",
+                                p->index, p->name, p->type,
+                                p->capability, p->rangelow,
+                                p->rangehigh, p->signal, p->afc,
+                                p->rxsubchans, p->audmode);
+                ret = ops->vidioc_s_tuner(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_FREQUENCY:
+        {
+                struct v4l2_frequency *p = arg;
+
+                if (!ops->vidioc_g_frequency)
+                        break;
+
+                memset(p->reserved, 0, sizeof(p->reserved));
+
+                ret = ops->vidioc_g_frequency(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",
+                                        p->tuner, p->type, p->frequency);
+                break;
+        }
+        case VIDIOC_S_FREQUENCY:
+        {
+                struct v4l2_frequency *p = arg;
+
+                if (!ops->vidioc_s_frequency)
+                        break;
+                dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",
+                                p->tuner, p->type, p->frequency);
+                ret = ops->vidioc_s_frequency(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_SLICED_VBI_CAP:
+        {
+                struct v4l2_sliced_vbi_cap *p = arg;
+                __u32 type = p->type;
+
+                if (!ops->vidioc_g_sliced_vbi_cap)
+                        break;
+                memset(p, 0, sizeof(*p));
+                p->type = type;
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+                ret = ops->vidioc_g_sliced_vbi_cap(file, fh, p);
+                if (!ret)
+                        dbgarg2("service_set=%d\n", p->service_set);
+                break;
+        }
+        case VIDIOC_LOG_STATUS:
+        {
+                if (!ops->vidioc_log_status)
+                        break;
+                ret = ops->vidioc_log_status(file, fh);
+                break;
+        }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_G_REGISTER:
+        {
+                struct v4l2_register *p = arg;
+
+                if (!capable(CAP_SYS_ADMIN))
+                        ret = -EPERM;
+                else if (ops->vidioc_g_register)
+                        ret = ops->vidioc_g_register(file, fh, p);
+                break;
+        }
+        case VIDIOC_DBG_S_REGISTER:
+        {
+                struct v4l2_register *p = arg;
+
+                if (!capable(CAP_SYS_ADMIN))
+                        ret = -EPERM;
+                else if (ops->vidioc_s_register)
+                        ret = ops->vidioc_s_register(file, fh, p);
+                break;
+        }
+#endif
+        case VIDIOC_G_CHIP_IDENT:
+        {
+                struct v4l2_chip_ident *p = arg;
+
+                if (!ops->vidioc_g_chip_ident)
+                        break;
+                ret = ops->vidioc_g_chip_ident(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
+                break;
+        }
+        case VIDIOC_S_HW_FREQ_SEEK:
+        {
+                struct v4l2_hw_freq_seek *p = arg;
+
+                if (!ops->vidioc_s_hw_freq_seek)
+                        break;
+                dbgarg(cmd,
+                        "tuner=%d, type=%d, seek_upward=%d, wrap_around=%d\n",
+                        p->tuner, p->type, p->seek_upward, p->wrap_around);
+                ret = ops->vidioc_s_hw_freq_seek(file, fh, p);
+                break;
+        }
+        default:
+        {
+                if (!ops->vidioc_default)
+                        break;
+                ret = ops->vidioc_default(file, fh, cmd, arg);
+                break;
+        }
+        } /* switch */
+
+        if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
+                if (ret < 0) {
+                        v4l_print_ioctl(vfd->name, cmd);
+                        printk(KERN_CONT " error %d\n", ret);
+                }
+        }
+
+        return ret;
+}
+
+int video_ioctl2(struct inode *inode, struct file *file,
+               unsigned int cmd, unsigned long arg)
+{
+        char    sbuf[128];
+        void    *mbuf = NULL;
+        void    *parg = NULL;
+        int     err  = -EINVAL;
+        int     is_ext_ctrl;
+        size_t  ctrls_size = 0;
+        void __user *user_ptr = NULL;
+
+#ifdef __OLD_VIDIOC_
+        cmd = video_fix_command(cmd);
+#endif
+        is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||
+                       cmd == VIDIOC_TRY_EXT_CTRLS);
+
+        /*  Copy arguments into temp kernel buffer  */
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_NONE:
+                parg = NULL;
+                break;
+        case _IOC_READ:
+        case _IOC_WRITE:
+        case (_IOC_WRITE | _IOC_READ):
+                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
+                        parg = sbuf;
+                } else {
+                        /* too big to allocate from stack */
+                        mbuf = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL);
+                        if (NULL == mbuf)
+                                return -ENOMEM;
+                        parg = mbuf;
+                }
+
+                err = -EFAULT;
+                if (_IOC_DIR(cmd) & _IOC_WRITE)
+                        if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
+                                goto out;
+                break;
+        }
+
+        if (is_ext_ctrl) {
+                struct v4l2_ext_controls *p = parg;
+
+                /* In case of an error, tell the caller that it wasn't
+                   a specific control that caused it. */
+                p->error_idx = p->count;
+                user_ptr = (void __user *)p->controls;
+                if (p->count) {
+                        ctrls_size = sizeof(struct v4l2_ext_control) * p->count;
+                        /* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */
+                        mbuf = kmalloc(ctrls_size, GFP_KERNEL);
+                        err = -ENOMEM;
+                        if (NULL == mbuf)
+                                goto out_ext_ctrl;
+                        err = -EFAULT;
+                        if (copy_from_user(mbuf, user_ptr, ctrls_size))
+                                goto out_ext_ctrl;
+                        p->controls = mbuf;
+                }
+        }
+
+        /* Handles IOCTL */
+        err = __video_do_ioctl(inode, file, cmd, parg);
+        if (err == -ENOIOCTLCMD)
+                err = -EINVAL;
+        if (is_ext_ctrl) {
+                struct v4l2_ext_controls *p = parg;
+
+                p->controls = (void *)user_ptr;
+                if (p->count && err == 0 && copy_to_user(user_ptr, mbuf, ctrls_size))
+                        err = -EFAULT;
+                goto out_ext_ctrl;
+        }
+        if (err < 0)
+                goto out;
+
+out_ext_ctrl:
+        /*  Copy results into user buffer  */
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_READ:
+        case (_IOC_WRITE | _IOC_READ):
+                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+                        err = -EFAULT;
+                break;
+        }
+
+out:
+        kfree(mbuf);
+        return err;
+}
+EXPORT_SYMBOL(video_ioctl2);
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index 03f20acb668c..31944b11e6ea 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -28,10 +28,10 @@ struct videobuf_dma_contig_memory {
 };
 
 #define MAGIC_DC_MEM 0x0733ac61
-#define MAGIC_CHECK(is, should)                                         \
-        if (unlikely((is) != (should))) {                               \
-                pr_err("magic mismatch: %x expected %x\n", is, should); \
-                BUG();                                                  \
+#define MAGIC_CHECK(is, should)                                             \
+        if (unlikely((is) != (should))) {                                   \
+                pr_err("magic mismatch: %x expected %x\n", (is), (should)); \
+                BUG();                                                      \
         }
 
 static void
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index a868b7ed75ff..be65a2fb3976 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -203,7 +203,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                         return 0;
 
                 /* FIXME: to properly support USERPTR, remap should occur.
-                   The code bellow won't work, since mem->vma = NULL
+                   The code below won't work, since mem->vma = NULL
                  */
                 /* Try to remap memory */
                 rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0);
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 6616e6570557..e69de29bb2d1 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1,2262 +0,0 @@
-/*
- * Video capture interface for Linux version 2
- *
- *      A generic video device interface for the LINUX operating system
- *      using a set of device structures/vectors for low level operations.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors:     Alan Cox, <alan@redhat.com> (version 1)
- *              Mauro Carvalho Chehab <mchehab@infradead.org> (version 2)
- *
- * Fixes:       20000516  Claudio Matsuoka <claudio@conectiva.com>
- *              - Added procfs support
- */
-
-#define dbgarg(cmd, fmt, arg...) \
-                do {                                                    \
-                    if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {            \
-                        printk(KERN_DEBUG "%s: ",  vfd->name);          \
-                        v4l_printk_ioctl(cmd);                          \
-                        printk(" " fmt,  ## arg);                       \
-                    }                                                   \
-                } while (0)
-
-#define dbgarg2(fmt, arg...) \
-                do {                                                    \
-                    if (vfd->debug & V4L2_DEBUG_IOCTL_ARG)              \
-                        printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\
-                } while (0)
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kmod.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#define __OLD_VIDIOC_ /* To allow fixing old calls*/
-#include <linux/videodev2.h>
-
-#ifdef CONFIG_VIDEO_V4L1
-#include <linux/videodev.h>
-#endif
-#include <media/v4l2-common.h>
-#include <linux/video_decoder.h>
-
-#define VIDEO_NUM_DEVICES       256
-#define VIDEO_NAME              "video4linux"
-
-struct std_descr {
-        v4l2_std_id std;
-        const char *descr;
-};
-
-static const struct std_descr standards[] = {
-        { V4L2_STD_NTSC,        "NTSC"      },
-        { V4L2_STD_NTSC_M,      "NTSC-M"    },
-        { V4L2_STD_NTSC_M_JP,   "NTSC-M-JP" },
-        { V4L2_STD_NTSC_M_KR,   "NTSC-M-KR" },
-        { V4L2_STD_NTSC_443,    "NTSC-443"  },
-        { V4L2_STD_PAL,         "PAL"       },
-        { V4L2_STD_PAL_BG,      "PAL-BG"    },
-        { V4L2_STD_PAL_B,       "PAL-B"     },
-        { V4L2_STD_PAL_B1,      "PAL-B1"    },
-        { V4L2_STD_PAL_G,       "PAL-G"     },
-        { V4L2_STD_PAL_H,       "PAL-H"     },
-        { V4L2_STD_PAL_I,       "PAL-I"     },
-        { V4L2_STD_PAL_DK,      "PAL-DK"    },
-        { V4L2_STD_PAL_D,       "PAL-D"     },
-        { V4L2_STD_PAL_D1,      "PAL-D1"    },
-        { V4L2_STD_PAL_K,       "PAL-K"     },
-        { V4L2_STD_PAL_M,       "PAL-M"     },
-        { V4L2_STD_PAL_N,       "PAL-N"     },
-        { V4L2_STD_PAL_Nc,      "PAL-Nc"    },
-        { V4L2_STD_PAL_60,      "PAL-60"    },
-        { V4L2_STD_SECAM,       "SECAM"     },
-        { V4L2_STD_SECAM_B,     "SECAM-B"   },
-        { V4L2_STD_SECAM_G,     "SECAM-G"   },
-        { V4L2_STD_SECAM_H,     "SECAM-H"   },
-        { V4L2_STD_SECAM_DK,    "SECAM-DK"  },
-        { V4L2_STD_SECAM_D,     "SECAM-D"   },
-        { V4L2_STD_SECAM_K,     "SECAM-K"   },
-        { V4L2_STD_SECAM_K1,    "SECAM-K1"  },
-        { V4L2_STD_SECAM_L,     "SECAM-L"   },
-        { V4L2_STD_SECAM_LC,    "SECAM-Lc"  },
-        { 0,                    "Unknown"   }
-};
-
-/* video4linux standard ID conversion to standard name
- */
-const char *v4l2_norm_to_name(v4l2_std_id id)
-{
-        u32 myid = id;
-        int i;
-
-        /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle
-           64 bit comparations. So, on that architecture, with some gcc
-           variants, compilation fails. Currently, the max value is 30bit wide.
-         */
-        BUG_ON(myid != id);
-
-        for (i = 0; standards[i].std; i++)
-                if (myid == standards[i].std)
-                        break;
-        return standards[i].descr;
-}
-EXPORT_SYMBOL(v4l2_norm_to_name);
-
-/* Fill in the fields of a v4l2_standard structure according to the
-   'id' and 'transmission' parameters.  Returns negative on error.  */
-int v4l2_video_std_construct(struct v4l2_standard *vs,
-                             int id, const char *name)
-{
-        u32 index = vs->index;
-
-        memset(vs, 0, sizeof(struct v4l2_standard));
-        vs->index = index;
-        vs->id    = id;
-        if (id & V4L2_STD_525_60) {
-                vs->frameperiod.numerator = 1001;
-                vs->frameperiod.denominator = 30000;
-                vs->framelines = 525;
-        } else {
-                vs->frameperiod.numerator = 1;
-                vs->frameperiod.denominator = 25;
-                vs->framelines = 625;
-        }
-        strlcpy(vs->name, name, sizeof(vs->name));
-        return 0;
-}
-EXPORT_SYMBOL(v4l2_video_std_construct);
-
-/* ----------------------------------------------------------------- */
-/* some arrays for pretty-printing debug messages of enum types      */
-
-const char *v4l2_field_names[] = {
-        [V4L2_FIELD_ANY]        = "any",
-        [V4L2_FIELD_NONE]       = "none",
-        [V4L2_FIELD_TOP]        = "top",
-        [V4L2_FIELD_BOTTOM]     = "bottom",
-        [V4L2_FIELD_INTERLACED] = "interlaced",
-        [V4L2_FIELD_SEQ_TB]     = "seq-tb",
-        [V4L2_FIELD_SEQ_BT]     = "seq-bt",
-        [V4L2_FIELD_ALTERNATE]  = "alternate",
-        [V4L2_FIELD_INTERLACED_TB] = "interlaced-tb",
-        [V4L2_FIELD_INTERLACED_BT] = "interlaced-bt",
-};
-EXPORT_SYMBOL(v4l2_field_names);
-
-const char *v4l2_type_names[] = {
-        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "vid-cap",
-        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "vid-overlay",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "vid-out",
-        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
-        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
-        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
-        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "vid-out-overlay",
-};
-EXPORT_SYMBOL(v4l2_type_names);
-
-static const char *v4l2_memory_names[] = {
-        [V4L2_MEMORY_MMAP]    = "mmap",
-        [V4L2_MEMORY_USERPTR] = "userptr",
-        [V4L2_MEMORY_OVERLAY] = "overlay",
-};
-
-#define prt_names(a, arr) ((((a) >= 0) && ((a) < ARRAY_SIZE(arr))) ? \
-                           arr[a] : "unknown")
-
-/* ------------------------------------------------------------------ */
-/* debug help functions                                               */
-
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static const char *v4l1_ioctls[] = {
-        [_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",
-        [_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
-        [_IOC_NR(VIDIOCSCHAN)]      = "VIDIOCSCHAN",
-        [_IOC_NR(VIDIOCGTUNER)]     = "VIDIOCGTUNER",
-        [_IOC_NR(VIDIOCSTUNER)]     = "VIDIOCSTUNER",
-        [_IOC_NR(VIDIOCGPICT)]      = "VIDIOCGPICT",
-        [_IOC_NR(VIDIOCSPICT)]      = "VIDIOCSPICT",
-        [_IOC_NR(VIDIOCCAPTURE)]    = "VIDIOCCAPTURE",
-        [_IOC_NR(VIDIOCGWIN)]       = "VIDIOCGWIN",
-        [_IOC_NR(VIDIOCSWIN)]       = "VIDIOCSWIN",
-        [_IOC_NR(VIDIOCGFBUF)]      = "VIDIOCGFBUF",
-        [_IOC_NR(VIDIOCSFBUF)]      = "VIDIOCSFBUF",
-        [_IOC_NR(VIDIOCKEY)]        = "VIDIOCKEY",
-        [_IOC_NR(VIDIOCGFREQ)]      = "VIDIOCGFREQ",
-        [_IOC_NR(VIDIOCSFREQ)]      = "VIDIOCSFREQ",
-        [_IOC_NR(VIDIOCGAUDIO)]     = "VIDIOCGAUDIO",
-        [_IOC_NR(VIDIOCSAUDIO)]     = "VIDIOCSAUDIO",
-        [_IOC_NR(VIDIOCSYNC)]       = "VIDIOCSYNC",
-        [_IOC_NR(VIDIOCMCAPTURE)]   = "VIDIOCMCAPTURE",
-        [_IOC_NR(VIDIOCGMBUF)]      = "VIDIOCGMBUF",
-        [_IOC_NR(VIDIOCGUNIT)]      = "VIDIOCGUNIT",
-        [_IOC_NR(VIDIOCGCAPTURE)]   = "VIDIOCGCAPTURE",
-        [_IOC_NR(VIDIOCSCAPTURE)]   = "VIDIOCSCAPTURE",
-        [_IOC_NR(VIDIOCSPLAYMODE)]  = "VIDIOCSPLAYMODE",
-        [_IOC_NR(VIDIOCSWRITEMODE)] = "VIDIOCSWRITEMODE",
-        [_IOC_NR(VIDIOCGPLAYINFO)]  = "VIDIOCGPLAYINFO",
-        [_IOC_NR(VIDIOCSMICROCODE)] = "VIDIOCSMICROCODE",
-        [_IOC_NR(VIDIOCGVBIFMT)]    = "VIDIOCGVBIFMT",
-        [_IOC_NR(VIDIOCSVBIFMT)]    = "VIDIOCSVBIFMT"
-};
-#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
-#endif
-
-static const char *v4l2_ioctls[] = {
-        [_IOC_NR(VIDIOC_QUERYCAP)]         = "VIDIOC_QUERYCAP",
-        [_IOC_NR(VIDIOC_RESERVED)]         = "VIDIOC_RESERVED",
-        [_IOC_NR(VIDIOC_ENUM_FMT)]         = "VIDIOC_ENUM_FMT",
-        [_IOC_NR(VIDIOC_G_FMT)]            = "VIDIOC_G_FMT",
-        [_IOC_NR(VIDIOC_S_FMT)]            = "VIDIOC_S_FMT",
-        [_IOC_NR(VIDIOC_REQBUFS)]          = "VIDIOC_REQBUFS",
-        [_IOC_NR(VIDIOC_QUERYBUF)]         = "VIDIOC_QUERYBUF",
-        [_IOC_NR(VIDIOC_G_FBUF)]           = "VIDIOC_G_FBUF",
-        [_IOC_NR(VIDIOC_S_FBUF)]           = "VIDIOC_S_FBUF",
-        [_IOC_NR(VIDIOC_OVERLAY)]          = "VIDIOC_OVERLAY",
-        [_IOC_NR(VIDIOC_QBUF)]             = "VIDIOC_QBUF",
-        [_IOC_NR(VIDIOC_DQBUF)]            = "VIDIOC_DQBUF",
-        [_IOC_NR(VIDIOC_STREAMON)]         = "VIDIOC_STREAMON",
-        [_IOC_NR(VIDIOC_STREAMOFF)]        = "VIDIOC_STREAMOFF",
-        [_IOC_NR(VIDIOC_G_PARM)]           = "VIDIOC_G_PARM",
-        [_IOC_NR(VIDIOC_S_PARM)]           = "VIDIOC_S_PARM",
-        [_IOC_NR(VIDIOC_G_STD)]            = "VIDIOC_G_STD",
-        [_IOC_NR(VIDIOC_S_STD)]            = "VIDIOC_S_STD",
-        [_IOC_NR(VIDIOC_ENUMSTD)]          = "VIDIOC_ENUMSTD",
-        [_IOC_NR(VIDIOC_ENUMINPUT)]        = "VIDIOC_ENUMINPUT",
-        [_IOC_NR(VIDIOC_G_CTRL)]           = "VIDIOC_G_CTRL",
-        [_IOC_NR(VIDIOC_S_CTRL)]           = "VIDIOC_S_CTRL",
-        [_IOC_NR(VIDIOC_G_TUNER)]          = "VIDIOC_G_TUNER",
-        [_IOC_NR(VIDIOC_S_TUNER)]          = "VIDIOC_S_TUNER",
-        [_IOC_NR(VIDIOC_G_AUDIO)]          = "VIDIOC_G_AUDIO",
-        [_IOC_NR(VIDIOC_S_AUDIO)]          = "VIDIOC_S_AUDIO",
-        [_IOC_NR(VIDIOC_QUERYCTRL)]        = "VIDIOC_QUERYCTRL",
-        [_IOC_NR(VIDIOC_QUERYMENU)]        = "VIDIOC_QUERYMENU",
-        [_IOC_NR(VIDIOC_G_INPUT)]          = "VIDIOC_G_INPUT",
-        [_IOC_NR(VIDIOC_S_INPUT)]          = "VIDIOC_S_INPUT",
-        [_IOC_NR(VIDIOC_G_OUTPUT)]         = "VIDIOC_G_OUTPUT",
-        [_IOC_NR(VIDIOC_S_OUTPUT)]         = "VIDIOC_S_OUTPUT",
-        [_IOC_NR(VIDIOC_ENUMOUTPUT)]       = "VIDIOC_ENUMOUTPUT",
-        [_IOC_NR(VIDIOC_G_AUDOUT)]         = "VIDIOC_G_AUDOUT",
-        [_IOC_NR(VIDIOC_S_AUDOUT)]         = "VIDIOC_S_AUDOUT",
-        [_IOC_NR(VIDIOC_G_MODULATOR)]      = "VIDIOC_G_MODULATOR",
-        [_IOC_NR(VIDIOC_S_MODULATOR)]      = "VIDIOC_S_MODULATOR",
-        [_IOC_NR(VIDIOC_G_FREQUENCY)]      = "VIDIOC_G_FREQUENCY",
-        [_IOC_NR(VIDIOC_S_FREQUENCY)]      = "VIDIOC_S_FREQUENCY",
-        [_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",
-        [_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",
-        [_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",
-        [_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",
-        [_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",
-        [_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",
-        [_IOC_NR(VIDIOC_TRY_FMT)]          = "VIDIOC_TRY_FMT",
-        [_IOC_NR(VIDIOC_ENUMAUDIO)]        = "VIDIOC_ENUMAUDIO",
-        [_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",
-        [_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",
-        [_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",
-        [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",
-        [_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",
-        [_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",
-        [_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",
-        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",
-#if 1
-        [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
-        [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
-        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
-        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
-        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD",
-
-        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]   = "VIDIOC_DBG_S_REGISTER",
-        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]   = "VIDIOC_DBG_G_REGISTER",
-
-        [_IOC_NR(VIDIOC_G_CHIP_IDENT)]     = "VIDIOC_G_CHIP_IDENT",
-        [_IOC_NR(VIDIOC_S_HW_FREQ_SEEK)]   = "VIDIOC_S_HW_FREQ_SEEK",
-#endif
-};
-#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
-
-static const char *v4l2_int_ioctls[] = {
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        [_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",
-        [_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",
-        [_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
-        [_IOC_NR(DECODER_SET_INPUT)]           = "DECODER_SET_INPUT",
-        [_IOC_NR(DECODER_SET_OUTPUT)]          = "DECODER_SET_OUTPUT",
-        [_IOC_NR(DECODER_ENABLE_OUTPUT)]       = "DECODER_ENABLE_OUTPUT",
-        [_IOC_NR(DECODER_SET_PICTURE)]         = "DECODER_SET_PICTURE",
-        [_IOC_NR(DECODER_SET_GPIO)]            = "DECODER_SET_GPIO",
-        [_IOC_NR(DECODER_INIT)]                = "DECODER_INIT",
-        [_IOC_NR(DECODER_SET_VBI_BYPASS)]      = "DECODER_SET_VBI_BYPASS",
-        [_IOC_NR(DECODER_DUMP)]                = "DECODER_DUMP",
-#endif
-        [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
-
-        [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
-        [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
-        [_IOC_NR(TUNER_SET_CONFIG)]            = "TUNER_SET_CONFIG",
-
-        [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
-        [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
-        [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)]  = "VIDIOC_INT_DECODE_VBI_LINE",
-        [_IOC_NR(VIDIOC_INT_S_VBI_DATA)]       = "VIDIOC_INT_S_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_G_VBI_DATA)]       = "VIDIOC_INT_G_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)]   = "VIDIOC_INT_I2S_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_S_STANDBY)]        = "VIDIOC_INT_S_STANDBY",
-        [_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ",
-        [_IOC_NR(VIDIOC_INT_INIT)]             = "VIDIOC_INT_INIT",
-        [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)]     = "VIDIOC_INT_G_STD_OUTPUT",
-        [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)]     = "VIDIOC_INT_S_STD_OUTPUT",
-};
-#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
-
-/* Common ioctl debug function. This function can be used by
-   external ioctl messages as well as internal V4L ioctl */
-void v4l_printk_ioctl(unsigned int cmd)
-{
-        char *dir, *type;
-
-        switch (_IOC_TYPE(cmd)) {
-        case 'd':
-                if (_IOC_NR(cmd) >= V4L2_INT_IOCTLS) {
-                        type = "v4l2_int";
-                        break;
-                }
-                printk("%s", v4l2_int_ioctls[_IOC_NR(cmd)]);
-                return;
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        case 'v':
-                if (_IOC_NR(cmd) >= V4L1_IOCTLS) {
-                        type = "v4l1";
-                        break;
-                }
-                printk("%s", v4l1_ioctls[_IOC_NR(cmd)]);
-                return;
-#endif
-        case 'V':
-                if (_IOC_NR(cmd) >= V4L2_IOCTLS) {
-                        type = "v4l2";
-                        break;
-                }
-                printk("%s", v4l2_ioctls[_IOC_NR(cmd)]);
-                return;
-        default:
-                type = "unknown";
-        }
-
-        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:              dir = "--"; break;
-        case _IOC_READ:              dir = "r-"; break;
-        case _IOC_WRITE:             dir = "-w"; break;
-        case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
-        default:                     dir = "*ERR*"; break;
-        }
-        printk("%s ioctl '%c', dir=%s, #%d (0x%08x)",
-                type, _IOC_TYPE(cmd), dir, _IOC_NR(cmd), cmd);
-}
-EXPORT_SYMBOL(v4l_printk_ioctl);
-
-/*
- *      sysfs stuff
- */
-
-static ssize_t show_index(struct device *cd,
-                         struct device_attribute *attr, char *buf)
-{
-        struct video_device *vfd = container_of(cd, struct video_device,
-                                                class_dev);
-        return sprintf(buf, "%i\n", vfd->index);
-}
-
-static ssize_t show_name(struct device *cd,
-                         struct device_attribute *attr, char *buf)
-{
-        struct video_device *vfd = container_of(cd, struct video_device,
-                                                class_dev);
-        return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
-}
-
-static struct device_attribute video_device_attrs[] = {
-        __ATTR(name, S_IRUGO, show_name, NULL),
-        __ATTR(index, S_IRUGO, show_index, NULL),
-        __ATTR_NULL
-};
-
-struct video_device *video_device_alloc(void)
-{
-        struct video_device *vfd;
-
-        vfd = kzalloc(sizeof(*vfd),GFP_KERNEL);
-        return vfd;
-}
-EXPORT_SYMBOL(video_device_alloc);
-
-void video_device_release(struct video_device *vfd)
-{
-        kfree(vfd);
-}
-EXPORT_SYMBOL(video_device_release);
-
-static void video_release(struct device *cd)
-{
-        struct video_device *vfd = container_of(cd, struct video_device,
-                                                                class_dev);
-
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                return;
-#endif
-        vfd->release(vfd);
-}
-
-static struct class video_class = {
-        .name    = VIDEO_NAME,
-        .dev_attrs = video_device_attrs,
-        .dev_release = video_release,
-};
-
-/*
- *      Active devices
- */
-
-static struct video_device *video_device[VIDEO_NUM_DEVICES];
-static DEFINE_MUTEX(videodev_lock);
-
-struct video_device* video_devdata(struct file *file)
-{
-        return video_device[iminor(file->f_path.dentry->d_inode)];
-}
-EXPORT_SYMBOL(video_devdata);
-
-/*
- *      Open a video device - FIXME: Obsoleted
- */
-static int video_open(struct inode *inode, struct file *file)
-{
-        unsigned int minor = iminor(inode);
-        int err = 0;
-        struct video_device *vfl;
-        const struct file_operations *old_fops;
-
-        if(minor>=VIDEO_NUM_DEVICES)
-                return -ENODEV;
-        lock_kernel();
-        mutex_lock(&videodev_lock);
-        vfl=video_device[minor];
-        if(vfl==NULL) {
-                mutex_unlock(&videodev_lock);
-                request_module("char-major-%d-%d", VIDEO_MAJOR, minor);
-                mutex_lock(&videodev_lock);
-                vfl=video_device[minor];
-                if (vfl==NULL) {
-                        mutex_unlock(&videodev_lock);
-                        unlock_kernel();
-                        return -ENODEV;
-                }
-        }
-        old_fops = file->f_op;
-        file->f_op = fops_get(vfl->fops);
-        if(file->f_op->open)
-                err = file->f_op->open(inode,file);
-        if (err) {
-                fops_put(file->f_op);
-                file->f_op = fops_get(old_fops);
-        }
-        fops_put(old_fops);
-        mutex_unlock(&videodev_lock);
-        unlock_kernel();
-        return err;
-}
-
-/*
- * helper function -- handles userspace copying for ioctl arguments
- */
-
-#ifdef __OLD_VIDIOC_
-static unsigned int
-video_fix_command(unsigned int cmd)
-{
-        switch (cmd) {
-        case VIDIOC_OVERLAY_OLD:
-                cmd = VIDIOC_OVERLAY;
-                break;
-        case VIDIOC_S_PARM_OLD:
-                cmd = VIDIOC_S_PARM;
-                break;
-        case VIDIOC_S_CTRL_OLD:
-                cmd = VIDIOC_S_CTRL;
-                break;
-        case VIDIOC_G_AUDIO_OLD:
-                cmd = VIDIOC_G_AUDIO;
-                break;
-        case VIDIOC_G_AUDOUT_OLD:
-                cmd = VIDIOC_G_AUDOUT;
-                break;
-        case VIDIOC_CROPCAP_OLD:
-                cmd = VIDIOC_CROPCAP;
-                break;
-        }
-        return cmd;
-}
-#endif
-
-/*
- * Obsolete usercopy function - Should be removed soon
- */
-int
-video_usercopy(struct inode *inode, struct file *file,
-               unsigned int cmd, unsigned long arg,
-               int (*func)(struct inode *inode, struct file *file,
-                           unsigned int cmd, void *arg))
-{
-        char    sbuf[128];
-        void    *mbuf = NULL;
-        void    *parg = NULL;
-        int     err  = -EINVAL;
-        int     is_ext_ctrl;
-        size_t  ctrls_size = 0;
-        void __user *user_ptr = NULL;
-
-#ifdef __OLD_VIDIOC_
-        cmd = video_fix_command(cmd);
-#endif
-        is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||
-                       cmd == VIDIOC_TRY_EXT_CTRLS);
-
-        /*  Copy arguments into temp kernel buffer  */
-        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:
-                parg = NULL;
-                break;
-        case _IOC_READ:
-        case _IOC_WRITE:
-        case (_IOC_WRITE | _IOC_READ):
-                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-                        parg = sbuf;
-                } else {
-                        /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-                        if (NULL == mbuf)
-                                return -ENOMEM;
-                        parg = mbuf;
-                }
-
-                err = -EFAULT;
-                if (_IOC_DIR(cmd) & _IOC_WRITE)
-                        if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
-                                goto out;
-                break;
-        }
-        if (is_ext_ctrl) {
-                struct v4l2_ext_controls *p = parg;
-
-                /* In case of an error, tell the caller that it wasn't
-                   a specific control that caused it. */
-                p->error_idx = p->count;
-                user_ptr = (void __user *)p->controls;
-                if (p->count) {
-                        ctrls_size = sizeof(struct v4l2_ext_control) * p->count;
-                        /* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */
-                        mbuf = kmalloc(ctrls_size, GFP_KERNEL);
-                        err = -ENOMEM;
-                        if (NULL == mbuf)
-                                goto out_ext_ctrl;
-                        err = -EFAULT;
-                        if (copy_from_user(mbuf, user_ptr, ctrls_size))
-                                goto out_ext_ctrl;
-                        p->controls = mbuf;
-                }
-        }
-
-        /* call driver */
-        err = func(inode, file, cmd, parg);
-        if (err == -ENOIOCTLCMD)
-                err = -EINVAL;
-        if (is_ext_ctrl) {
-                struct v4l2_ext_controls *p = parg;
-
-                p->controls = (void *)user_ptr;
-                if (p->count && err == 0 && copy_to_user(user_ptr, mbuf, ctrls_size))
-                        err = -EFAULT;
-                goto out_ext_ctrl;
-        }
-        if (err < 0)
-                goto out;
-
-out_ext_ctrl:
-        /*  Copy results into user buffer  */
-        switch (_IOC_DIR(cmd))
-        {
-        case _IOC_READ:
-        case (_IOC_WRITE | _IOC_READ):
-                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
-                        err = -EFAULT;
-                break;
-        }
-
-out:
-        kfree(mbuf);
-        return err;
-}
-EXPORT_SYMBOL(video_usercopy);
-
-/*
- * open/release helper functions -- handle exclusive opens
- * Should be removed soon
- */
-int video_exclusive_open(struct inode *inode, struct file *file)
-{
-        struct  video_device *vfl = video_devdata(file);
-        int retval = 0;
-
-        mutex_lock(&vfl->lock);
-        if (vfl->users) {
-                retval = -EBUSY;
-        } else {
-                vfl->users++;
-        }
-        mutex_unlock(&vfl->lock);
-        return retval;
-}
-EXPORT_SYMBOL(video_exclusive_open);
-
-int video_exclusive_release(struct inode *inode, struct file *file)
-{
-        struct  video_device *vfl = video_devdata(file);
-
-        vfl->users--;
-        return 0;
-}
-EXPORT_SYMBOL(video_exclusive_release);
-
-static void dbgbuf(unsigned int cmd, struct video_device *vfd,
-                                        struct v4l2_buffer *p)
-{
-        struct v4l2_timecode *tc=&p->timecode;
-
-        dbgarg (cmd, "%02ld:%02d:%02d.%08ld index=%d, type=%s, "
-                "bytesused=%d, flags=0x%08d, "
-                "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx, length=%d\n",
-                        (p->timestamp.tv_sec/3600),
-                        (int)(p->timestamp.tv_sec/60)%60,
-                        (int)(p->timestamp.tv_sec%60),
-                        p->timestamp.tv_usec,
-                        p->index,
-                        prt_names(p->type, v4l2_type_names),
-                        p->bytesused, p->flags,
-                        p->field, p->sequence,
-                        prt_names(p->memory, v4l2_memory_names),
-                        p->m.userptr, p->length);
-        dbgarg2("timecode=%02d:%02d:%02d type=%d, "
-                "flags=0x%08d, frames=%d, userbits=0x%08x\n",
-                        tc->hours,tc->minutes,tc->seconds,
-                        tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
-}
-
-static inline void dbgrect(struct video_device *vfd, char *s,
-                                                        struct v4l2_rect *r)
-{
-        dbgarg2("%sRect start at %dx%d, size=%dx%d\n", s, r->left, r->top,
-                                                r->width, r->height);
-};
-
-static inline void v4l_print_pix_fmt (struct video_device *vfd,
-                                                struct v4l2_pix_format *fmt)
-{
-        dbgarg2 ("width=%d, height=%d, format=%c%c%c%c, field=%s, "
-                "bytesperline=%d sizeimage=%d, colorspace=%d\n",
-                fmt->width,fmt->height,
-                (fmt->pixelformat & 0xff),
-                (fmt->pixelformat >>  8) & 0xff,
-                (fmt->pixelformat >> 16) & 0xff,
-                (fmt->pixelformat >> 24) & 0xff,
-                prt_names(fmt->field, v4l2_field_names),
-                fmt->bytesperline, fmt->sizeimage, fmt->colorspace);
-};
-
-static inline void v4l_print_ext_ctrls(unsigned int cmd,
-        struct video_device *vfd, struct v4l2_ext_controls *c, int show_vals)
-{
-        __u32 i;
-
-        if (!(vfd->debug & V4L2_DEBUG_IOCTL_ARG))
-                return;
-        dbgarg(cmd, "");
-        printk(KERN_CONT "class=0x%x", c->ctrl_class);
-        for (i = 0; i < c->count; i++) {
-                if (show_vals)
-                        printk(KERN_CONT " id/val=0x%x/0x%x",
-                                c->controls[i].id, c->controls[i].value);
-                else
-                        printk(KERN_CONT " id=0x%x", c->controls[i].id);
-        }
-        printk(KERN_CONT "\n");
-};
-
-static inline int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv)
-{
-        __u32 i;
-
-        /* zero the reserved fields */
-        c->reserved[0] = c->reserved[1] = 0;
-        for (i = 0; i < c->count; i++) {
-                c->controls[i].reserved2[0] = 0;
-                c->controls[i].reserved2[1] = 0;
-        }
-        /* V4L2_CID_PRIVATE_BASE cannot be used as control class
-           when using extended controls.
-           Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL
-           is it allowed for backwards compatibility.
-         */
-        if (!allow_priv && c->ctrl_class == V4L2_CID_PRIVATE_BASE)
-                return 0;
-        /* Check that all controls are from the same control class. */
-        for (i = 0; i < c->count; i++) {
-                if (V4L2_CTRL_ID2CLASS(c->controls[i].id) != c->ctrl_class) {
-                        c->error_idx = i;
-                        return 0;
-                }
-        }
-        return 1;
-}
-
-static int check_fmt (struct video_device *vfd, enum v4l2_buf_type type)
-{
-        switch (type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                if (vfd->vidioc_try_fmt_vid_cap)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                if (vfd->vidioc_try_fmt_vid_overlay)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                if (vfd->vidioc_try_fmt_vid_out)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
-                if (vfd->vidioc_try_fmt_vid_out_overlay)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_VBI_CAPTURE:
-                if (vfd->vidioc_try_fmt_vbi_cap)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_VBI_OUTPUT:
-                if (vfd->vidioc_try_fmt_vbi_out)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-                if (vfd->vidioc_try_fmt_sliced_vbi_cap)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
-                if (vfd->vidioc_try_fmt_sliced_vbi_out)
-                        return (0);
-                break;
-        case V4L2_BUF_TYPE_PRIVATE:
-                if (vfd->vidioc_try_fmt_type_private)
-                        return (0);
-                break;
-        }
-        return (-EINVAL);
-}
-
-static int __video_do_ioctl(struct inode *inode, struct file *file,
-                unsigned int cmd, void *arg)
-{
-        struct video_device *vfd = video_devdata(file);
-        void                 *fh = file->private_data;
-        int                  ret = -EINVAL;
-
-        if ( (vfd->debug & V4L2_DEBUG_IOCTL) &&
-                                !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
-                v4l_print_ioctl(vfd->name, cmd);
-                printk("\n");
-        }
-
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        /***********************************************************
-         Handles calls to the obsoleted V4L1 API
-         Due to the nature of VIDIOCGMBUF, each driver that supports
-         V4L1 should implement its own handler for this ioctl.
-         ***********************************************************/
-
-        /* --- streaming capture ------------------------------------- */
-        if (cmd == VIDIOCGMBUF) {
-                struct video_mbuf *p=arg;
-
-                memset(p, 0, sizeof(*p));
-
-                if (!vfd->vidiocgmbuf)
-                        return ret;
-                ret=vfd->vidiocgmbuf(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "size=%d, frames=%d, offsets=0x%08lx\n",
-                                                p->size, p->frames,
-                                                (unsigned long)p->offsets);
-                return ret;
-        }
-
-        /********************************************************
-         All other V4L1 calls are handled by v4l1_compat module.
-         Those calls will be translated into V4L2 calls, and
-         __video_do_ioctl will be called again, with one or more
-         V4L2 ioctls.
-         ********************************************************/
-        if (_IOC_TYPE(cmd)=='v')
-                return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                __video_do_ioctl);
-#endif
-
-        switch(cmd) {
-        /* --- capabilities ------------------------------------------ */
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *cap = (struct v4l2_capability*)arg;
-                memset(cap, 0, sizeof(*cap));
-
-                if (!vfd->vidioc_querycap)
-                        break;
-
-                ret=vfd->vidioc_querycap(file, fh, cap);
-                if (!ret)
-                        dbgarg (cmd, "driver=%s, card=%s, bus=%s, "
-                                        "version=0x%08x, "
-                                        "capabilities=0x%08x\n",
-                                        cap->driver,cap->card,cap->bus_info,
-                                        cap->version,
-                                        cap->capabilities);
-                break;
-        }
-
-        /* --- priority ------------------------------------------ */
-        case VIDIOC_G_PRIORITY:
-        {
-                enum v4l2_priority *p=arg;
-
-                if (!vfd->vidioc_g_priority)
-                        break;
-                ret=vfd->vidioc_g_priority(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "priority is %d\n", *p);
-                break;
-        }
-        case VIDIOC_S_PRIORITY:
-        {
-                enum v4l2_priority *p=arg;
-
-                if (!vfd->vidioc_s_priority)
-                        break;
-                dbgarg(cmd, "setting priority to %d\n", *p);
-                ret=vfd->vidioc_s_priority(file, fh, *p);
-                break;
-        }
-
-        /* --- capture ioctls ---------------------------------------- */
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc *f = arg;
-                enum v4l2_buf_type type;
-                unsigned int index;
-
-                index = f->index;
-                type  = f->type;
-                memset(f,0,sizeof(*f));
-                f->index = index;
-                f->type  = type;
-
-                switch (type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        if (vfd->vidioc_enum_fmt_vid_cap)
-                                ret = vfd->vidioc_enum_fmt_vid_cap(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                        if (vfd->vidioc_enum_fmt_vid_overlay)
-                                ret = vfd->vidioc_enum_fmt_vid_overlay(file,
-                                        fh, f);
-                        break;
-#if 1
-                /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT
-                 * according to the spec. The bttv and saa7134 drivers support
-                 * it though, so just warn that this is deprecated and will be
-                 * removed in the near future. */
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (vfd->vidioc_enum_fmt_vbi_cap) {
-                                printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");
-                                ret = vfd->vidioc_enum_fmt_vbi_cap(file, fh, f);
-                        }
-                        break;
-#endif
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                        if (vfd->vidioc_enum_fmt_vid_out)
-                                ret = vfd->vidioc_enum_fmt_vid_out(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_PRIVATE:
-                        if (vfd->vidioc_enum_fmt_type_private)
-                                ret = vfd->vidioc_enum_fmt_type_private(file,
-                                                                fh, f);
-                        break;
-                default:
-                        break;
-                }
-                if (!ret)
-                        dbgarg (cmd, "index=%d, type=%d, flags=%d, "
-                                        "pixelformat=%c%c%c%c, description='%s'\n",
-                                        f->index, f->type, f->flags,
-                                        (f->pixelformat & 0xff),
-                                        (f->pixelformat >>  8) & 0xff,
-                                        (f->pixelformat >> 16) & 0xff,
-                                        (f->pixelformat >> 24) & 0xff,
-                                        f->description);
-                break;
-        }
-        case VIDIOC_G_FMT:
-        {
-                struct v4l2_format *f = (struct v4l2_format *)arg;
-
-                memset(f->fmt.raw_data, 0, sizeof(f->fmt.raw_data));
-
-                /* FIXME: Should be one dump per type */
-                dbgarg(cmd, "type=%s\n", prt_names(f->type, v4l2_type_names));
-
-                switch (f->type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        if (vfd->vidioc_g_fmt_vid_cap)
-                                ret = vfd->vidioc_g_fmt_vid_cap(file, fh, f);
-                        if (!ret)
-                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                        if (vfd->vidioc_g_fmt_vid_overlay)
-                                ret = vfd->vidioc_g_fmt_vid_overlay(file,
-                                                                    fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                        if (vfd->vidioc_g_fmt_vid_out)
-                                ret = vfd->vidioc_g_fmt_vid_out(file, fh, f);
-                        if (!ret)
-                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
-                        if (vfd->vidioc_g_fmt_vid_out_overlay)
-                                ret = vfd->vidioc_g_fmt_vid_out_overlay(file,
-                                       fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (vfd->vidioc_g_fmt_vbi_cap)
-                                ret = vfd->vidioc_g_fmt_vbi_cap(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_OUTPUT:
-                        if (vfd->vidioc_g_fmt_vbi_out)
-                                ret = vfd->vidioc_g_fmt_vbi_out(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-                        if (vfd->vidioc_g_fmt_sliced_vbi_cap)
-                                ret = vfd->vidioc_g_fmt_sliced_vbi_cap(file,
-                                                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
-                        if (vfd->vidioc_g_fmt_sliced_vbi_out)
-                                ret = vfd->vidioc_g_fmt_sliced_vbi_out(file,
-                                                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_PRIVATE:
-                        if (vfd->vidioc_g_fmt_type_private)
-                                ret = vfd->vidioc_g_fmt_type_private(file,
-                                                                fh, f);
-                        break;
-                }
-
-                break;
-        }
-        case VIDIOC_S_FMT:
-        {
-                struct v4l2_format *f = (struct v4l2_format *)arg;
-
-                /* FIXME: Should be one dump per type */
-                dbgarg(cmd, "type=%s\n", prt_names(f->type, v4l2_type_names));
-
-                switch (f->type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        if (vfd->vidioc_s_fmt_vid_cap)
-                                ret = vfd->vidioc_s_fmt_vid_cap(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                        if (vfd->vidioc_s_fmt_vid_overlay)
-                                ret = vfd->vidioc_s_fmt_vid_overlay(file,
-                                                                    fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                        v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        if (vfd->vidioc_s_fmt_vid_out)
-                                ret = vfd->vidioc_s_fmt_vid_out(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
-                        if (vfd->vidioc_s_fmt_vid_out_overlay)
-                                ret = vfd->vidioc_s_fmt_vid_out_overlay(file,
-                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (vfd->vidioc_s_fmt_vbi_cap)
-                                ret = vfd->vidioc_s_fmt_vbi_cap(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_OUTPUT:
-                        if (vfd->vidioc_s_fmt_vbi_out)
-                                ret = vfd->vidioc_s_fmt_vbi_out(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-                        if (vfd->vidioc_s_fmt_sliced_vbi_cap)
-                                ret = vfd->vidioc_s_fmt_sliced_vbi_cap(file,
-                                                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
-                        if (vfd->vidioc_s_fmt_sliced_vbi_out)
-                                ret = vfd->vidioc_s_fmt_sliced_vbi_out(file,
-                                                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_PRIVATE:
-                        if (vfd->vidioc_s_fmt_type_private)
-                                ret = vfd->vidioc_s_fmt_type_private(file,
-                                                                fh, f);
-                        break;
-                }
-                break;
-        }
-        case VIDIOC_TRY_FMT:
-        {
-                struct v4l2_format *f = (struct v4l2_format *)arg;
-
-                /* FIXME: Should be one dump per type */
-                dbgarg (cmd, "type=%s\n", prt_names(f->type,
-                                                v4l2_type_names));
-                switch (f->type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        if (vfd->vidioc_try_fmt_vid_cap)
-                                ret = vfd->vidioc_try_fmt_vid_cap(file, fh, f);
-                        if (!ret)
-                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                        if (vfd->vidioc_try_fmt_vid_overlay)
-                                ret = vfd->vidioc_try_fmt_vid_overlay(file,
-                                        fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                        if (vfd->vidioc_try_fmt_vid_out)
-                                ret = vfd->vidioc_try_fmt_vid_out(file, fh, f);
-                        if (!ret)
-                                v4l_print_pix_fmt(vfd, &f->fmt.pix);
-                        break;
-                case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
-                        if (vfd->vidioc_try_fmt_vid_out_overlay)
-                                ret = vfd->vidioc_try_fmt_vid_out_overlay(file,
-                                       fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (vfd->vidioc_try_fmt_vbi_cap)
-                                ret = vfd->vidioc_try_fmt_vbi_cap(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_VBI_OUTPUT:
-                        if (vfd->vidioc_try_fmt_vbi_out)
-                                ret = vfd->vidioc_try_fmt_vbi_out(file, fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-                        if (vfd->vidioc_try_fmt_sliced_vbi_cap)
-                                ret = vfd->vidioc_try_fmt_sliced_vbi_cap(file,
-                                                                fh, f);
-                        break;
-                case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
-                        if (vfd->vidioc_try_fmt_sliced_vbi_out)
-                                ret = vfd->vidioc_try_fmt_sliced_vbi_out(file,
-                                                                fh, f);
-                        break;
-                case V4L2_BUF_TYPE_PRIVATE:
-                        if (vfd->vidioc_try_fmt_type_private)
-                                ret = vfd->vidioc_try_fmt_type_private(file,
-                                                                fh, f);
-                        break;
-                }
-
-                break;
-        }
-        /* FIXME: Those buf reqs could be handled here,
-           with some changes on videobuf to allow its header to be included at
-           videodev2.h or being merged at videodev2.
-         */
-        case VIDIOC_REQBUFS:
-        {
-                struct v4l2_requestbuffers *p=arg;
-
-                if (!vfd->vidioc_reqbufs)
-                        break;
-                ret = check_fmt (vfd, p->type);
-                if (ret)
-                        break;
-
-                ret=vfd->vidioc_reqbufs(file, fh, p);
-                dbgarg (cmd, "count=%d, type=%s, memory=%s\n",
-                                p->count,
-                                prt_names(p->type, v4l2_type_names),
-                                prt_names(p->memory, v4l2_memory_names));
-                break;
-        }
-        case VIDIOC_QUERYBUF:
-        {
-                struct v4l2_buffer *p=arg;
-
-                if (!vfd->vidioc_querybuf)
-                        break;
-                ret = check_fmt (vfd, p->type);
-                if (ret)
-                        break;
-
-                ret=vfd->vidioc_querybuf(file, fh, p);
-                if (!ret)
-                        dbgbuf(cmd,vfd,p);
-                break;
-        }
-        case VIDIOC_QBUF:
-        {
-                struct v4l2_buffer *p=arg;
-
-                if (!vfd->vidioc_qbuf)
-                        break;
-                ret = check_fmt (vfd, p->type);
-                if (ret)
-                        break;
-
-                ret=vfd->vidioc_qbuf(file, fh, p);
-                if (!ret)
-                        dbgbuf(cmd,vfd,p);
-                break;
-        }
-        case VIDIOC_DQBUF:
-        {
-                struct v4l2_buffer *p=arg;
-                if (!vfd->vidioc_dqbuf)
-                        break;
-                ret = check_fmt (vfd, p->type);
-                if (ret)
-                        break;
-
-                ret=vfd->vidioc_dqbuf(file, fh, p);
-                if (!ret)
-                        dbgbuf(cmd,vfd,p);
-                break;
-        }
-        case VIDIOC_OVERLAY:
-        {
-                int *i = arg;
-
-                if (!vfd->vidioc_overlay)
-                        break;
-                dbgarg (cmd, "value=%d\n",*i);
-                ret=vfd->vidioc_overlay(file, fh, *i);
-                break;
-        }
-        case VIDIOC_G_FBUF:
-        {
-                struct v4l2_framebuffer *p = arg;
-
-                if (!vfd->vidioc_g_fbuf)
-                        break;
-                ret = vfd->vidioc_g_fbuf(file, fh, arg);
-                if (!ret) {
-                        dbgarg(cmd, "capability=0x%x, flags=%d, base=0x%08lx\n",
-                                        p->capability, p->flags,
-                                        (unsigned long)p->base);
-                        v4l_print_pix_fmt(vfd, &p->fmt);
-                }
-                break;
-        }
-        case VIDIOC_S_FBUF:
-        {
-                struct v4l2_framebuffer *p = arg;
-
-                if (!vfd->vidioc_s_fbuf)
-                        break;
-                dbgarg(cmd, "capability=0x%x, flags=%d, base=0x%08lx\n",
-                        p->capability, p->flags, (unsigned long)p->base);
-                v4l_print_pix_fmt(vfd, &p->fmt);
-                ret = vfd->vidioc_s_fbuf(file, fh, arg);
-                break;
-        }
-        case VIDIOC_STREAMON:
-        {
-                enum v4l2_buf_type i = *(int *)arg;
-                if (!vfd->vidioc_streamon)
-                        break;
-                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
-                ret=vfd->vidioc_streamon(file, fh,i);
-                break;
-        }
-        case VIDIOC_STREAMOFF:
-        {
-                enum v4l2_buf_type i = *(int *)arg;
-
-                if (!vfd->vidioc_streamoff)
-                        break;
-                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
-                ret=vfd->vidioc_streamoff(file, fh, i);
-                break;
-        }
-        /* ---------- tv norms ---------- */
-        case VIDIOC_ENUMSTD:
-        {
-                struct v4l2_standard *p = arg;
-                v4l2_std_id id = vfd->tvnorms, curr_id = 0;
-                unsigned int index = p->index, i, j = 0;
-                const char *descr = "";
-
-                /* Return norm array in a canonical way */
-                for (i = 0; i <= index && id; i++) {
-                        /* last std value in the standards array is 0, so this
-                           while always ends there since (id & 0) == 0. */
-                        while ((id & standards[j].std) != standards[j].std)
-                                j++;
-                        curr_id = standards[j].std;
-                        descr = standards[j].descr;
-                        j++;
-                        if (curr_id == 0)
-                                break;
-                        if (curr_id != V4L2_STD_PAL &&
-                            curr_id != V4L2_STD_SECAM &&
-                            curr_id != V4L2_STD_NTSC)
-                                id &= ~curr_id;
-                }
-                if (i <= index)
-                        return -EINVAL;
-
-                v4l2_video_std_construct(p, curr_id, descr);
-                p->index = index;
-
-                dbgarg(cmd, "index=%d, id=0x%Lx, name=%s, fps=%d/%d, "
-                                "framelines=%d\n", p->index,
-                                (unsigned long long)p->id, p->name,
-                                p->frameperiod.numerator,
-                                p->frameperiod.denominator,
-                                p->framelines);
-
-                ret = 0;
-                break;
-        }
-        case VIDIOC_G_STD:
-        {
-                v4l2_std_id *id = arg;
-
-                ret = 0;
-                /* Calls the specific handler */
-                if (vfd->vidioc_g_std)
-                        ret = vfd->vidioc_g_std(file, fh, id);
-                else
-                        *id = vfd->current_norm;
-
-                if (!ret)
-                        dbgarg(cmd, "std=0x%08Lx\n", (long long unsigned)*id);
-                break;
-        }
-        case VIDIOC_S_STD:
-        {
-                v4l2_std_id *id = arg,norm;
-
-                dbgarg(cmd, "std=%08Lx\n", (long long unsigned)*id);
-
-                norm = (*id) & vfd->tvnorms;
-                if ( vfd->tvnorms && !norm)     /* Check if std is supported */
-                        break;
-
-                /* Calls the specific handler */
-                if (vfd->vidioc_s_std)
-                        ret=vfd->vidioc_s_std(file, fh, &norm);
-                else
-                        ret=-EINVAL;
-
-                /* Updates standard information */
-                if (ret>=0)
-                        vfd->current_norm=norm;
-
-                break;
-        }
-        case VIDIOC_QUERYSTD:
-        {
-                v4l2_std_id *p=arg;
-
-                if (!vfd->vidioc_querystd)
-                        break;
-                ret=vfd->vidioc_querystd(file, fh, arg);
-                if (!ret)
-                        dbgarg (cmd, "detected std=%08Lx\n",
-                                                (unsigned long long)*p);
-                break;
-        }
-        /* ------ input switching ---------- */
-        /* FIXME: Inputs can be handled inside videodev2 */
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *p=arg;
-                int i=p->index;
-
-                if (!vfd->vidioc_enum_input)
-                        break;
-                memset(p, 0, sizeof(*p));
-                p->index=i;
-
-                ret=vfd->vidioc_enum_input(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "index=%d, name=%s, type=%d, "
-                                        "audioset=%d, "
-                                        "tuner=%d, std=%08Lx, status=%d\n",
-                                        p->index,p->name,p->type,p->audioset,
-                                        p->tuner,
-                                        (unsigned long long)p->std,
-                                        p->status);
-                break;
-        }
-        case VIDIOC_G_INPUT:
-        {
-                unsigned int *i = arg;
-
-                if (!vfd->vidioc_g_input)
-                        break;
-                ret=vfd->vidioc_g_input(file, fh, i);
-                if (!ret)
-                        dbgarg (cmd, "value=%d\n",*i);
-                break;
-        }
-        case VIDIOC_S_INPUT:
-        {
-                unsigned int *i = arg;
-
-                if (!vfd->vidioc_s_input)
-                        break;
-                dbgarg (cmd, "value=%d\n",*i);
-                ret=vfd->vidioc_s_input(file, fh, *i);
-                break;
-        }
-
-        /* ------ output switching ---------- */
-        case VIDIOC_ENUMOUTPUT:
-        {
-                struct v4l2_output *p = arg;
-                int i = p->index;
-
-                if (!vfd->vidioc_enum_output)
-                        break;
-                memset(p, 0, sizeof(*p));
-                p->index = i;
-
-                ret = vfd->vidioc_enum_output(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "index=%d, name=%s, type=%d, "
-                                "audioset=0x%x, "
-                                "modulator=%d, std=0x%08Lx\n",
-                                p->index, p->name, p->type, p->audioset,
-                                p->modulator, (unsigned long long)p->std);
-                break;
-        }
-        case VIDIOC_G_OUTPUT:
-        {
-                unsigned int *i = arg;
-
-                if (!vfd->vidioc_g_output)
-                        break;
-                ret=vfd->vidioc_g_output(file, fh, i);
-                if (!ret)
-                        dbgarg (cmd, "value=%d\n",*i);
-                break;
-        }
-        case VIDIOC_S_OUTPUT:
-        {
-                unsigned int *i = arg;
-
-                if (!vfd->vidioc_s_output)
-                        break;
-                dbgarg (cmd, "value=%d\n",*i);
-                ret=vfd->vidioc_s_output(file, fh, *i);
-                break;
-        }
-
-        /* --- controls ---------------------------------------------- */
-        case VIDIOC_QUERYCTRL:
-        {
-                struct v4l2_queryctrl *p = arg;
-
-                if (!vfd->vidioc_queryctrl)
-                        break;
-                ret = vfd->vidioc_queryctrl(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "id=0x%x, type=%d, name=%s, min/max=%d/%d, "
-                                        "step=%d, default=%d, flags=0x%08x\n",
-                                        p->id, p->type, p->name,
-                                        p->minimum, p->maximum,
-                                        p->step, p->default_value, p->flags);
-                else
-                        dbgarg(cmd, "id=0x%x\n", p->id);
-                break;
-        }
-        case VIDIOC_G_CTRL:
-        {
-                struct v4l2_control *p = arg;
-
-                if (vfd->vidioc_g_ctrl)
-                        ret = vfd->vidioc_g_ctrl(file, fh, p);
-                else if (vfd->vidioc_g_ext_ctrls) {
-                        struct v4l2_ext_controls ctrls;
-                        struct v4l2_ext_control ctrl;
-
-                        ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);
-                        ctrls.count = 1;
-                        ctrls.controls = &ctrl;
-                        ctrl.id = p->id;
-                        ctrl.value = p->value;
-                        if (check_ext_ctrls(&ctrls, 1)) {
-                                ret = vfd->vidioc_g_ext_ctrls(file, fh, &ctrls);
-                                if (ret == 0)
-                                        p->value = ctrl.value;
-                        }
-                } else
-                        break;
-                if (!ret)
-                        dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
-                else
-                        dbgarg(cmd, "id=0x%x\n", p->id);
-                break;
-        }
-        case VIDIOC_S_CTRL:
-        {
-                struct v4l2_control *p = arg;
-                struct v4l2_ext_controls ctrls;
-                struct v4l2_ext_control ctrl;
-
-                if (!vfd->vidioc_s_ctrl && !vfd->vidioc_s_ext_ctrls)
-                        break;
-
-                dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
-
-                if (vfd->vidioc_s_ctrl) {
-                        ret = vfd->vidioc_s_ctrl(file, fh, p);
-                        break;
-                }
-                if (!vfd->vidioc_s_ext_ctrls)
-                        break;
-
-                ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);
-                ctrls.count = 1;
-                ctrls.controls = &ctrl;
-                ctrl.id = p->id;
-                ctrl.value = p->value;
-                if (check_ext_ctrls(&ctrls, 1))
-                        ret = vfd->vidioc_s_ext_ctrls(file, fh, &ctrls);
-                break;
-        }
-        case VIDIOC_G_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *p = arg;
-
-                p->error_idx = p->count;
-                if (!vfd->vidioc_g_ext_ctrls)
-                        break;
-                if (check_ext_ctrls(p, 0))
-                        ret = vfd->vidioc_g_ext_ctrls(file, fh, p);
-                v4l_print_ext_ctrls(cmd, vfd, p, !ret);
-                break;
-        }
-        case VIDIOC_S_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *p = arg;
-
-                p->error_idx = p->count;
-                if (!vfd->vidioc_s_ext_ctrls)
-                        break;
-                v4l_print_ext_ctrls(cmd, vfd, p, 1);
-                if (check_ext_ctrls(p, 0))
-                        ret = vfd->vidioc_s_ext_ctrls(file, fh, p);
-                break;
-        }
-        case VIDIOC_TRY_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *p = arg;
-
-                p->error_idx = p->count;
-                if (!vfd->vidioc_try_ext_ctrls)
-                        break;
-                v4l_print_ext_ctrls(cmd, vfd, p, 1);
-                if (check_ext_ctrls(p, 0))
-                        ret = vfd->vidioc_try_ext_ctrls(file, fh, p);
-                break;
-        }
-        case VIDIOC_QUERYMENU:
-        {
-                struct v4l2_querymenu *p = arg;
-
-                if (!vfd->vidioc_querymenu)
-                        break;
-                ret = vfd->vidioc_querymenu(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "id=0x%x, index=%d, name=%s\n",
-                                p->id, p->index, p->name);
-                else
-                        dbgarg(cmd, "id=0x%x, index=%d\n",
-                                p->id, p->index);
-                break;
-        }
-        /* --- audio ---------------------------------------------- */
-        case VIDIOC_ENUMAUDIO:
-        {
-                struct v4l2_audio *p = arg;
-
-                if (!vfd->vidioc_enumaudio)
-                        break;
-                ret = vfd->vidioc_enumaudio(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
-                                        "mode=0x%x\n", p->index, p->name,
-                                        p->capability, p->mode);
-                else
-                        dbgarg(cmd, "index=%d\n", p->index);
-                break;
-        }
-        case VIDIOC_G_AUDIO:
-        {
-                struct v4l2_audio *p = arg;
-                __u32 index = p->index;
-
-                if (!vfd->vidioc_g_audio)
-                        break;
-
-                memset(p, 0, sizeof(*p));
-                p->index = index;
-                ret = vfd->vidioc_g_audio(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
-                                        "mode=0x%x\n", p->index,
-                                        p->name, p->capability, p->mode);
-                else
-                        dbgarg(cmd, "index=%d\n", p->index);
-                break;
-        }
-        case VIDIOC_S_AUDIO:
-        {
-                struct v4l2_audio *p = arg;
-
-                if (!vfd->vidioc_s_audio)
-                        break;
-                dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
-                                        "mode=0x%x\n", p->index, p->name,
-                                        p->capability, p->mode);
-                ret = vfd->vidioc_s_audio(file, fh, p);
-                break;
-        }
-        case VIDIOC_ENUMAUDOUT:
-        {
-                struct v4l2_audioout *p=arg;
-
-                if (!vfd->vidioc_enumaudout)
-                        break;
-                dbgarg(cmd, "Enum for index=%d\n", p->index);
-                ret=vfd->vidioc_enumaudout(file, fh, p);
-                if (!ret)
-                        dbgarg2("index=%d, name=%s, capability=%d, "
-                                        "mode=%d\n", p->index, p->name,
-                                        p->capability,p->mode);
-                break;
-        }
-        case VIDIOC_G_AUDOUT:
-        {
-                struct v4l2_audioout *p=arg;
-
-                if (!vfd->vidioc_g_audout)
-                        break;
-                dbgarg(cmd, "Enum for index=%d\n", p->index);
-                ret=vfd->vidioc_g_audout(file, fh, p);
-                if (!ret)
-                        dbgarg2("index=%d, name=%s, capability=%d, "
-                                        "mode=%d\n", p->index, p->name,
-                                        p->capability,p->mode);
-                break;
-        }
-        case VIDIOC_S_AUDOUT:
-        {
-                struct v4l2_audioout *p=arg;
-
-                if (!vfd->vidioc_s_audout)
-                        break;
-                dbgarg(cmd, "index=%d, name=%s, capability=%d, "
-                                        "mode=%d\n", p->index, p->name,
-                                        p->capability,p->mode);
-
-                ret=vfd->vidioc_s_audout(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_MODULATOR:
-        {
-                struct v4l2_modulator *p=arg;
-                if (!vfd->vidioc_g_modulator)
-                        break;
-                ret=vfd->vidioc_g_modulator(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "index=%d, name=%s, "
-                                        "capability=%d, rangelow=%d,"
-                                        " rangehigh=%d, txsubchans=%d\n",
-                                        p->index, p->name,p->capability,
-                                        p->rangelow, p->rangehigh,
-                                        p->txsubchans);
-                break;
-        }
-        case VIDIOC_S_MODULATOR:
-        {
-                struct v4l2_modulator *p=arg;
-                if (!vfd->vidioc_s_modulator)
-                        break;
-                dbgarg(cmd, "index=%d, name=%s, capability=%d, "
-                                "rangelow=%d, rangehigh=%d, txsubchans=%d\n",
-                                p->index, p->name,p->capability,p->rangelow,
-                                p->rangehigh,p->txsubchans);
-                        ret=vfd->vidioc_s_modulator(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_CROP:
-        {
-                struct v4l2_crop *p=arg;
-                if (!vfd->vidioc_g_crop)
-                        break;
-                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
-                ret=vfd->vidioc_g_crop(file, fh, p);
-                if (!ret) {
-                        dbgrect(vfd, "", &p->c);
-                }
-                break;
-        }
-        case VIDIOC_S_CROP:
-        {
-                struct v4l2_crop *p=arg;
-                if (!vfd->vidioc_s_crop)
-                        break;
-                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
-                dbgrect(vfd, "", &p->c);
-                ret=vfd->vidioc_s_crop(file, fh, p);
-                break;
-        }
-        case VIDIOC_CROPCAP:
-        {
-                struct v4l2_cropcap *p = arg;
-
-                /*FIXME: Should also show v4l2_fract pixelaspect */
-                if (!vfd->vidioc_cropcap)
-                        break;
-                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
-                ret = vfd->vidioc_cropcap(file, fh, p);
-                if (!ret) {
-                        dbgrect(vfd, "bounds ", &p->bounds);
-                        dbgrect(vfd, "defrect ", &p->defrect);
-                }
-                break;
-        }
-        case VIDIOC_G_JPEGCOMP:
-        {
-                struct v4l2_jpegcompression *p=arg;
-                if (!vfd->vidioc_g_jpegcomp)
-                        break;
-                ret=vfd->vidioc_g_jpegcomp(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "quality=%d, APPn=%d, "
-                                                "APP_len=%d, COM_len=%d, "
-                                                "jpeg_markers=%d\n",
-                                                p->quality,p->APPn,p->APP_len,
-                                                p->COM_len,p->jpeg_markers);
-                break;
-        }
-        case VIDIOC_S_JPEGCOMP:
-        {
-                struct v4l2_jpegcompression *p=arg;
-                if (!vfd->vidioc_g_jpegcomp)
-                        break;
-                dbgarg (cmd, "quality=%d, APPn=%d, APP_len=%d, "
-                                        "COM_len=%d, jpeg_markers=%d\n",
-                                        p->quality,p->APPn,p->APP_len,
-                                        p->COM_len,p->jpeg_markers);
-                        ret=vfd->vidioc_s_jpegcomp(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_ENC_INDEX:
-        {
-                struct v4l2_enc_idx *p=arg;
-
-                if (!vfd->vidioc_g_enc_index)
-                        break;
-                ret=vfd->vidioc_g_enc_index(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "entries=%d, entries_cap=%d\n",
-                                        p->entries,p->entries_cap);
-                break;
-        }
-        case VIDIOC_ENCODER_CMD:
-        {
-                struct v4l2_encoder_cmd *p = arg;
-
-                if (!vfd->vidioc_encoder_cmd)
-                        break;
-                memset(&p->raw, 0, sizeof(p->raw));
-                ret = vfd->vidioc_encoder_cmd(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags);
-                break;
-        }
-        case VIDIOC_TRY_ENCODER_CMD:
-        {
-                struct v4l2_encoder_cmd *p = arg;
-
-                if (!vfd->vidioc_try_encoder_cmd)
-                        break;
-                memset(&p->raw, 0, sizeof(p->raw));
-                ret = vfd->vidioc_try_encoder_cmd(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags);
-                break;
-        }
-        case VIDIOC_G_PARM:
-        {
-                struct v4l2_streamparm *p=arg;
-                __u32 type=p->type;
-
-                memset(p,0,sizeof(*p));
-                p->type=type;
-
-                if (vfd->vidioc_g_parm) {
-                        ret=vfd->vidioc_g_parm(file, fh, p);
-                } else {
-                        struct v4l2_standard s;
-
-                        if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                                return -EINVAL;
-
-                        v4l2_video_std_construct(&s, vfd->current_norm,
-                                                 v4l2_norm_to_name(vfd->current_norm));
-
-                        p->parm.capture.timeperframe = s.frameperiod;
-                        ret=0;
-                }
-
-                dbgarg (cmd, "type=%d\n", p->type);
-                break;
-        }
-        case VIDIOC_S_PARM:
-        {
-                struct v4l2_streamparm *p=arg;
-                if (!vfd->vidioc_s_parm)
-                        break;
-                dbgarg (cmd, "type=%d\n", p->type);
-                ret=vfd->vidioc_s_parm(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_TUNER:
-        {
-                struct v4l2_tuner *p = arg;
-                __u32 index = p->index;
-
-                if (!vfd->vidioc_g_tuner)
-                        break;
-
-                memset(p, 0, sizeof(*p));
-                p->index = index;
-
-                ret = vfd->vidioc_g_tuner(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "index=%d, name=%s, type=%d, "
-                                        "capability=0x%x, rangelow=%d, "
-                                        "rangehigh=%d, signal=%d, afc=%d, "
-                                        "rxsubchans=0x%x, audmode=%d\n",
-                                        p->index, p->name, p->type,
-                                        p->capability, p->rangelow,
-                                        p->rangehigh, p->signal, p->afc,
-                                        p->rxsubchans, p->audmode);
-                break;
-        }
-        case VIDIOC_S_TUNER:
-        {
-                struct v4l2_tuner *p = arg;
-
-                if (!vfd->vidioc_s_tuner)
-                        break;
-                dbgarg(cmd, "index=%d, name=%s, type=%d, "
-                                "capability=0x%x, rangelow=%d, "
-                                "rangehigh=%d, signal=%d, afc=%d, "
-                                "rxsubchans=0x%x, audmode=%d\n",
-                                p->index, p->name, p->type,
-                                p->capability, p->rangelow,
-                                p->rangehigh, p->signal, p->afc,
-                                p->rxsubchans, p->audmode);
-                ret = vfd->vidioc_s_tuner(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_FREQUENCY:
-        {
-                struct v4l2_frequency *p = arg;
-
-                if (!vfd->vidioc_g_frequency)
-                        break;
-
-                memset(p->reserved, 0, sizeof(p->reserved));
-
-                ret = vfd->vidioc_g_frequency(file, fh, p);
-                if (!ret)
-                        dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",
-                                        p->tuner, p->type, p->frequency);
-                break;
-        }
-        case VIDIOC_S_FREQUENCY:
-        {
-                struct v4l2_frequency *p=arg;
-                if (!vfd->vidioc_s_frequency)
-                        break;
-                dbgarg (cmd, "tuner=%d, type=%d, frequency=%d\n",
-                                p->tuner,p->type,p->frequency);
-                ret=vfd->vidioc_s_frequency(file, fh, p);
-                break;
-        }
-        case VIDIOC_G_SLICED_VBI_CAP:
-        {
-                struct v4l2_sliced_vbi_cap *p = arg;
-                __u32 type = p->type;
-
-                if (!vfd->vidioc_g_sliced_vbi_cap)
-                        break;
-                memset(p, 0, sizeof(*p));
-                p->type = type;
-                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
-                ret = vfd->vidioc_g_sliced_vbi_cap(file, fh, p);
-                if (!ret)
-                        dbgarg2("service_set=%d\n", p->service_set);
-                break;
-        }
-        case VIDIOC_LOG_STATUS:
-        {
-                if (!vfd->vidioc_log_status)
-                        break;
-                ret=vfd->vidioc_log_status(file, fh);
-                break;
-        }
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_DBG_G_REGISTER:
-        {
-                struct v4l2_register *p=arg;
-                if (!capable(CAP_SYS_ADMIN))
-                        ret=-EPERM;
-                else if (vfd->vidioc_g_register)
-                        ret=vfd->vidioc_g_register(file, fh, p);
-                break;
-        }
-        case VIDIOC_DBG_S_REGISTER:
-        {
-                struct v4l2_register *p=arg;
-                if (!capable(CAP_SYS_ADMIN))
-                        ret=-EPERM;
-                else if (vfd->vidioc_s_register)
-                        ret=vfd->vidioc_s_register(file, fh, p);
-                break;
-        }
-#endif
-        case VIDIOC_G_CHIP_IDENT:
-        {
-                struct v4l2_chip_ident *p=arg;
-                if (!vfd->vidioc_g_chip_ident)
-                        break;
-                ret=vfd->vidioc_g_chip_ident(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
-                break;
-        }
-        default:
-        {
-                if (!vfd->vidioc_default)
-                        break;
-                ret = vfd->vidioc_default(file, fh, cmd, arg);
-                break;
-        }
-        case VIDIOC_S_HW_FREQ_SEEK:
-        {
-                struct v4l2_hw_freq_seek *p = arg;
-                if (!vfd->vidioc_s_hw_freq_seek)
-                        break;
-                dbgarg(cmd,
-                        "tuner=%d, type=%d, seek_upward=%d, wrap_around=%d\n",
-                        p->tuner, p->type, p->seek_upward, p->wrap_around);
-                ret = vfd->vidioc_s_hw_freq_seek(file, fh, p);
-                break;
-        }
-        } /* switch */
-
-        if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
-                if (ret < 0) {
-                        v4l_print_ioctl(vfd->name, cmd);
-                        printk(KERN_CONT " error %d\n", ret);
-                }
-        }
-
-        return ret;
-}
-
-int video_ioctl2 (struct inode *inode, struct file *file,
-               unsigned int cmd, unsigned long arg)
-{
-        char    sbuf[128];
-        void    *mbuf = NULL;
-        void    *parg = NULL;
-        int     err  = -EINVAL;
-        int     is_ext_ctrl;
-        size_t  ctrls_size = 0;
-        void __user *user_ptr = NULL;
-
-#ifdef __OLD_VIDIOC_
-        cmd = video_fix_command(cmd);
-#endif
-        is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||
-                       cmd == VIDIOC_TRY_EXT_CTRLS);
-
-        /*  Copy arguments into temp kernel buffer  */
-        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:
-                parg = NULL;
-                break;
-        case _IOC_READ:
-        case _IOC_WRITE:
-        case (_IOC_WRITE | _IOC_READ):
-                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-                        parg = sbuf;
-                } else {
-                        /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-                        if (NULL == mbuf)
-                                return -ENOMEM;
-                        parg = mbuf;
-                }
-
-                err = -EFAULT;
-                if (_IOC_DIR(cmd) & _IOC_WRITE)
-                        if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
-                                goto out;
-                break;
-        }
-
-        if (is_ext_ctrl) {
-                struct v4l2_ext_controls *p = parg;
-
-                /* In case of an error, tell the caller that it wasn't
-                   a specific control that caused it. */
-                p->error_idx = p->count;
-                user_ptr = (void __user *)p->controls;
-                if (p->count) {
-                        ctrls_size = sizeof(struct v4l2_ext_control) * p->count;
-                        /* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */
-                        mbuf = kmalloc(ctrls_size, GFP_KERNEL);
-                        err = -ENOMEM;
-                        if (NULL == mbuf)
-                                goto out_ext_ctrl;
-                        err = -EFAULT;
-                        if (copy_from_user(mbuf, user_ptr, ctrls_size))
-                                goto out_ext_ctrl;
-                        p->controls = mbuf;
-                }
-        }
-
-        /* Handles IOCTL */
-        err = __video_do_ioctl(inode, file, cmd, parg);
-        if (err == -ENOIOCTLCMD)
-                err = -EINVAL;
-        if (is_ext_ctrl) {
-                struct v4l2_ext_controls *p = parg;
-
-                p->controls = (void *)user_ptr;
-                if (p->count && err == 0 && copy_to_user(user_ptr, mbuf, ctrls_size))
-                        err = -EFAULT;
-                goto out_ext_ctrl;
-        }
-        if (err < 0)
-                goto out;
-
-out_ext_ctrl:
-        /*  Copy results into user buffer  */
-        switch (_IOC_DIR(cmd))
-        {
-        case _IOC_READ:
-        case (_IOC_WRITE | _IOC_READ):
-                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
-                        err = -EFAULT;
-                break;
-        }
-
-out:
-        kfree(mbuf);
-        return err;
-}
-EXPORT_SYMBOL(video_ioctl2);
-
-/**
- * get_index - assign stream number based on parent device
- * @vdev: video_device to assign index number to, vdev->dev should be assigned
- * @num: -1 if auto assign, requested number otherwise
- *
- *
- * returns -ENFILE if num is already in use, a free index number if
- * successful.
- */
-static int get_index(struct video_device *vdev, int num)
-{
-        u32 used = 0;
-        const int max_index = sizeof(used) * 8 - 1;
-        int i;
-
-        /* Currently a single v4l driver instance cannot create more than
-           32 devices.
-           Increase to u64 or an array of u32 if more are needed. */
-        if (num > max_index) {
-                printk(KERN_ERR "videodev: %s num is too large\n", __func__);
-                return -EINVAL;
-        }
-
-        for (i = 0; i < VIDEO_NUM_DEVICES; i++) {
-                if (video_device[i] != NULL &&
-                    video_device[i] != vdev &&
-                    video_device[i]->dev == vdev->dev) {
-                        used |= 1 << video_device[i]->index;
-                }
-        }
-
-        if (num >= 0) {
-                if (used & (1 << num))
-                        return -ENFILE;
-                return num;
-        }
-
-        i = ffz(used);
-        return i > max_index ? -ENFILE : i;
-}
-
-static const struct file_operations video_fops;
-
-int video_register_device(struct video_device *vfd, int type, int nr)
-{
-        return video_register_device_index(vfd, type, nr, -1);
-}
-EXPORT_SYMBOL(video_register_device);
-
-/**
- *      video_register_device - register video4linux devices
- *      @vfd:  video device structure we want to register
- *      @type: type of device to register
- *      @nr:   which device number (0 == /dev/video0, 1 == /dev/video1, ...
- *             -1 == first free)
- *
- *      The registration code assigns minor numbers based on the type
- *      requested. -ENFILE is returned in all the device slots for this
- *      category are full. If not then the minor field is set and the
- *      driver initialize function is called (if non %NULL).
- *
- *      Zero is returned on success.
- *
- *      Valid types are
- *
- *      %VFL_TYPE_GRABBER - A frame grabber
- *
- *      %VFL_TYPE_VTX - A teletext device
- *
- *      %VFL_TYPE_VBI - Vertical blank data (undecoded)
- *
- *      %VFL_TYPE_RADIO - A radio card
- */
-
-int video_register_device_index(struct video_device *vfd, int type, int nr,
-                                        int index)
-{
-        int i=0;
-        int base;
-        int end;
-        int ret;
-        char *name_base;
-
-        switch(type)
-        {
-                case VFL_TYPE_GRABBER:
-                        base=MINOR_VFL_TYPE_GRABBER_MIN;
-                        end=MINOR_VFL_TYPE_GRABBER_MAX+1;
-                        name_base = "video";
-                        break;
-                case VFL_TYPE_VTX:
-                        base=MINOR_VFL_TYPE_VTX_MIN;
-                        end=MINOR_VFL_TYPE_VTX_MAX+1;
-                        name_base = "vtx";
-                        break;
-                case VFL_TYPE_VBI:
-                        base=MINOR_VFL_TYPE_VBI_MIN;
-                        end=MINOR_VFL_TYPE_VBI_MAX+1;
-                        name_base = "vbi";
-                        break;
-                case VFL_TYPE_RADIO:
-                        base=MINOR_VFL_TYPE_RADIO_MIN;
-                        end=MINOR_VFL_TYPE_RADIO_MAX+1;
-                        name_base = "radio";
-                        break;
-                default:
-                        printk(KERN_ERR "%s called with unknown type: %d\n",
-                               __func__, type);
-                        return -1;
-        }
-
-        /* pick a minor number */
-        mutex_lock(&videodev_lock);
-        if (nr >= 0  &&  nr < end-base) {
-                /* use the one the driver asked for */
-                i = base+nr;
-                if (NULL != video_device[i]) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
-        } else {
-                /* use first free */
-                for(i=base;i<end;i++)
-                        if (NULL == video_device[i])
-                                break;
-                if (i == end) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
-        }
-        video_device[i]=vfd;
-        vfd->minor=i;
-
-        ret = get_index(vfd, index);
-        vfd->index = ret;
-
-        mutex_unlock(&videodev_lock);
-
-        if (ret < 0) {
-                printk(KERN_ERR "%s: get_index failed\n", __func__);
-                goto fail_minor;
-        }
-
-        mutex_init(&vfd->lock);
-
-        /* sysfs class */
-        memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));
-        vfd->class_dev.class       = &video_class;
-        vfd->class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd->minor);
-        if (vfd->dev)
-                vfd->class_dev.parent = vfd->dev;
-        sprintf(vfd->class_dev.bus_id, "%s%d", name_base, i - base);
-        ret = device_register(&vfd->class_dev);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: device_register failed\n", __func__);
-                goto fail_minor;
-        }
-
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-                       "Please fix your driver for proper sysfs support, see "
-                       "http://lwn.net/Articles/36850/\n", vfd->name);
-#endif
-        return 0;
-
-fail_minor:
-        mutex_lock(&videodev_lock);
-        video_device[vfd->minor] = NULL;
-        vfd->minor = -1;
-        mutex_unlock(&videodev_lock);
-        return ret;
-}
-EXPORT_SYMBOL(video_register_device_index);
-
-/**
- *      video_unregister_device - unregister a video4linux device
- *      @vfd: the device to unregister
- *
- *      This unregisters the passed device and deassigns the minor
- *      number. Future open calls will be met with errors.
- */
-
-void video_unregister_device(struct video_device *vfd)
-{
-        mutex_lock(&videodev_lock);
-        if(video_device[vfd->minor]!=vfd)
-                panic("videodev: bad unregister");
-
-        video_device[vfd->minor]=NULL;
-        device_unregister(&vfd->class_dev);
-        mutex_unlock(&videodev_lock);
-}
-EXPORT_SYMBOL(video_unregister_device);
-
-/*
- * Video fs operations
- */
-static const struct file_operations video_fops=
-{
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .open           = video_open,
-};
-
-/*
- *      Initialise video for linux
- */
-
-static int __init videodev_init(void)
-{
-        int ret;
-
-        printk(KERN_INFO "Linux video capture interface: v2.00\n");
-        if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &video_fops)) {
-                printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);
-                return -EIO;
-        }
-
-        ret = class_register(&video_class);
-        if (ret < 0) {
-                unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
-                printk(KERN_WARNING "video_dev: class_register failed\n");
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static void __exit videodev_exit(void)
-{
-        class_unregister(&video_class);
-        unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
-}
-
-module_init(videodev_init)
-module_exit(videodev_exit)
-
-MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@infradead.org>");
-MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");
-MODULE_LICENSE("GPL");
-
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 01ea99c9bc1a..3989b0eded28 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -38,7 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-sgi.h>
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <linux/video_decoder.h>
 #include <linux/mutex.h>
@@ -4385,8 +4385,6 @@ static const struct file_operations vino_fops = {
 
 static struct video_device v4l_device_template = {
         .name           = "NOT SET",
-        /*.type         = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */
-        /*      VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */
         .fops           = &vino_fops,
         .minor          = -1,
 };
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 059b01c11dc1..3518af071a2e 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -35,6 +35,7 @@
 #include <linux/interrupt.h>
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/kthread.h>
 #include <linux/highmem.h>
 #include <linux/freezer.h>
@@ -1065,13 +1066,7 @@ static const struct file_operations vivi_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device vivi_template = {
-        .name           = "vivi",
-        .type           = VID_TYPE_CAPTURE,
-        .fops           = &vivi_fops,
-        .minor          = -1,
-        .release        = video_device_release,
-
+static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
@@ -1093,6 +1088,15 @@ static struct video_device vivi_template = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         .vidiocgmbuf          = vidiocgmbuf,
 #endif
+};
+
+static struct video_device vivi_template = {
+        .name           = "vivi",
+        .fops           = &vivi_fops,
+        .ioctl_ops      = &vivi_ioctl_ops,
+        .minor          = -1,
+        .release        = video_device_release,
+
         .tvnorms              = V4L2_STD_525_60,
         .current_norm         = V4L2_STD_NTSC_M,
 };
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index cbecb3cbbbaa..577956c5410b 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -27,7 +27,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-i2c-drv.h>
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 33f702698a56..9402f40095b4 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -57,8 +57,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/parport.h>
 
 /*#define DEBUG*/                               /* Undef me for production */
@@ -195,9 +196,7 @@ static const struct file_operations w9966_fops = {
         .llseek         = no_llseek,
 };
 static struct video_device w9966_template = {
-        .owner          = THIS_MODULE,
         .name           = W9966_DRIVERNAME,
-        .type           = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
         .fops           = &w9966_fops,
 };
 
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 840522442d07..168baabe4659 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -42,6 +42,7 @@
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <linux/page-flags.h>
+#include <media/v4l2-ioctl.h>
 
 #include "w9968cf.h"
 #include "w9968cf_decoder.h"
@@ -3549,13 +3550,11 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
-        cam->v4ldev->owner = THIS_MODULE;
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &w9968cf_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
         video_set_drvdata(cam->v4ldev, cam);
-        cam->v4ldev->dev = &cam->dev;
+        cam->v4ldev->parent = &cam->dev;
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
                                     video_nr[dev_nr]);
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h
index 3c95316bc030..30032e15e23c 100644
--- a/drivers/media/video/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -21,7 +21,7 @@
 #ifndef _W9968CF_H_
 #define _W9968CF_H_
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/device.h>
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index 7be47a255853..95c79ad80487 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -27,7 +27,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-i2c-drv.h>
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index c2ab70a04a74..48df661d4fc3 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -31,7 +31,7 @@
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-i2c-drv-legacy.h>
diff --git a/drivers/media/video/zc0301/zc0301.h b/drivers/media/video/zc0301/zc0301.h
index 7bbab541a309..b1b5cceb4baa 100644
--- a/drivers/media/video/zc0301/zc0301.h
+++ b/drivers/media/video/zc0301/zc0301.h
@@ -25,6 +25,7 @@
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index e5c4e9f5193f..550ce7bd5c87 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1985,8 +1985,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &zc0301_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 0929edb2d4f1..d842a7cb99d2 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -161,7 +161,7 @@ static struct pci_device_id zr36067_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);
 
 int zoran_num;                  /* number of Buzs in use */
-struct zoran zoran[BUZ_MAX];
+struct zoran *zoran[BUZ_MAX];
 
 /* videocodec bus functions ZR36060 */
 static u32
@@ -355,9 +355,15 @@ i2cid_to_modulename (u16 i2c_id)
         case I2C_DRIVERID_BT856:
                 name = "bt856";
                 break;
+        case I2C_DRIVERID_BT866:
+                name = "bt866";
+                break;
         case I2C_DRIVERID_VPX3220:
                 name = "vpx3220";
                 break;
+        case I2C_DRIVERID_KS0127:
+                name = "ks0127";
+                break;
         }
 
         return name;
@@ -1164,7 +1170,7 @@ static void
 zoran_release (struct zoran *zr)
 {
         if (!zr->initialized)
-                return;
+                goto exit_free;
         /* unregister videocodec bus */
         if (zr->codec) {
                 struct videocodec_master *master = zr->codec->master_data;
@@ -1192,6 +1198,8 @@ zoran_release (struct zoran *zr)
         iounmap(zr->zr36057_mem);
         pci_disable_device(zr->pci_dev);
         video_unregister_device(zr->video_dev);
+exit_free:
+        kfree(zr);
 }
 
 void
@@ -1269,8 +1277,14 @@ find_zr36057 (void)
         while (zoran_num < BUZ_MAX &&
                (dev = pci_get_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057, dev)) != NULL) {
                 card_num = card[zoran_num];
-                zr = &zoran[zoran_num];
-                memset(zr, 0, sizeof(struct zoran));    // Just in case if previous cycle failed
+                zr = kzalloc(sizeof(struct zoran), GFP_KERNEL);
+                if (!zr) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - kzalloc failed\n",
+                                ZORAN_NAME);
+                        continue;
+                }
                 zr->pci_dev = dev;
                 //zr->zr36057_mem = NULL;
                 zr->id = zoran_num;
@@ -1278,7 +1292,7 @@ find_zr36057 (void)
                 spin_lock_init(&zr->spinlock);
                 mutex_init(&zr->resource_lock);
                 if (pci_enable_device(dev))
-                        continue;
+                        goto zr_free_mem;
                 zr->zr36057_adr = pci_resource_start(zr->pci_dev, 0);
                 pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION,
                                      &zr->revision);
@@ -1294,7 +1308,7 @@ find_zr36057 (void)
                                         KERN_ERR
                                         "%s: find_zr36057() - no card specified, please use the card=X insmod option\n",
                                         ZR_DEVNAME(zr));
-                                continue;
+                                goto zr_free_mem;
                         }
                 } else {
                         int i;
@@ -1333,7 +1347,7 @@ find_zr36057 (void)
                                                 KERN_ERR
                                                 "%s: find_zr36057() - unknown card\n",
                                                 ZR_DEVNAME(zr));
-                                        continue;
+                                        goto zr_free_mem;
                                 }
                         }
                 }
@@ -1343,7 +1357,7 @@ find_zr36057 (void)
                                 KERN_ERR
                                 "%s: find_zr36057() - invalid cardnum %d\n",
                                 ZR_DEVNAME(zr), card_num);
-                        continue;
+                        goto zr_free_mem;
                 }
 
                 /* even though we make this a non pointer and thus
@@ -1361,7 +1375,7 @@ find_zr36057 (void)
                                 KERN_ERR
                                 "%s: find_zr36057() - ioremap failed\n",
                                 ZR_DEVNAME(zr));
-                        continue;
+                        goto zr_free_mem;
                 }
 
                 result = request_irq(zr->pci_dev->irq,
@@ -1530,7 +1544,7 @@ find_zr36057 (void)
                 }
                 /* Success so keep the pci_dev referenced */
                 pci_dev_get(zr->pci_dev);
-                zoran_num++;
+                zoran[zoran_num++] = zr;
                 continue;
 
                 // Init errors
@@ -1549,6 +1563,8 @@ find_zr36057 (void)
                 free_irq(zr->pci_dev->irq, zr);
               zr_unmap:
                 iounmap(zr->zr36057_mem);
+              zr_free_mem:
+                kfree(zr);
                 continue;
         }
         if (dev)        /* Clean up ref count on early exit */
@@ -1620,7 +1636,7 @@ init_dc10_cards (void)
 
         /* take care of Natoma chipset and a revision 1 zr36057 */
         for (i = 0; i < zoran_num; i++) {
-                struct zoran *zr = &zoran[i];
+                struct zoran *zr = zoran[i];
 
                 if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) {
                         zr->jpg_buffers.need_contiguous = 1;
@@ -1632,7 +1648,7 @@ init_dc10_cards (void)
 
                 if (zr36057_init(zr) < 0) {
                         for (i = 0; i < zoran_num; i++)
-                                zoran_release(&zoran[i]);
+                                zoran_release(zoran[i]);
                         return -EIO;
                 }
                 zoran_proc_init(zr);
@@ -1647,7 +1663,7 @@ unload_dc10_cards (void)
         int i;
 
         for (i = 0; i < zoran_num; i++)
-                zoran_release(&zoran[i]);
+                zoran_release(zoran[i]);
 }
 
 module_init(init_dc10_cards);
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran_card.h
index 1b5c4171cf9c..e4dc9d29b404 100644
--- a/drivers/media/video/zoran_card.h
+++ b/drivers/media/video/zoran_card.h
@@ -41,7 +41,7 @@ extern int zr36067_debug;
 /* Anybody who uses more than four? */
 #define BUZ_MAX 4
 extern int zoran_num;
-extern struct zoran zoran[BUZ_MAX];
+extern struct zoran *zoran[BUZ_MAX];
 
 extern struct video_device zoran_template;
 
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index c0675921fe20..ec6f59674b10 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -71,6 +71,7 @@
 
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include "videocodec.h"
 
 #include <asm/byteorder.h>
@@ -1212,8 +1213,8 @@ zoran_open (struct inode *inode,
 
         /* find the device */
         for (i = 0; i < zoran_num; i++) {
-                if (zoran[i].video_dev->minor == minor) {
-                        zr = &zoran[i];
+                if (zoran[i]->video_dev->minor == minor) {
+                        zr = zoran[i];
                         break;
                 }
         }
@@ -4643,8 +4644,6 @@ static const struct file_operations zoran_fops = {
 
 struct video_device zoran_template __devinitdata = {
         .name = ZORAN_NAME,
-        .type = ZORAN_VID_TYPE,
-        .type2 = ZORAN_V4L2_VID_FLAGS,
         .fops = &zoran_fops,
         .release = &zoran_vdev_release,
         .minor = -1
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 485df2e36132..18d1c4ba79fb 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -35,6 +35,7 @@
 #include <linux/proc_fs.h>
 #include <linux/highmem.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 
 /* Version Information */
@@ -761,14 +762,7 @@ static const struct file_operations zr364xx_fops = {
         .llseek = no_llseek,
 };
 
-static struct video_device zr364xx_template = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_DESC,
-        .type = VID_TYPE_CAPTURE,
-        .fops = &zr364xx_fops,
-        .release = video_device_release,
-        .minor = -1,
-
+static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = {
         .vidioc_querycap        = zr364xx_vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap,
@@ -784,6 +778,14 @@ static struct video_device zr364xx_template = {
         .vidioc_s_ctrl          = zr364xx_vidioc_s_ctrl,
 };
 
+static struct video_device zr364xx_template = {
+        .name = DRIVER_DESC,
+        .fops = &zr364xx_fops,
+        .ioctl_ops = &zr364xx_ioctl_ops,
+        .release = video_device_release,
+        .minor = -1,
+};
+
 
 
 /*******************/
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 34402c47027e..d6a0074b9dc3 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -273,12 +273,12 @@ mpt_fault_reset_work(struct work_struct *work)
         ioc_raw_state = mpt_GetIocState(ioc, 0);
         if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT) {
                 printk(MYIOC_s_WARN_FMT "IOC is in FAULT state (%04xh)!!!\n",
-                    ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK);
+                       ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK);
                 printk(MYIOC_s_WARN_FMT "Issuing HardReset from %s!!\n",
-                    ioc->name, __FUNCTION__);
+                       ioc->name, __func__);
                 rc = mpt_HardResetHandler(ioc, CAN_SLEEP);
                 printk(MYIOC_s_WARN_FMT "%s: HardReset: %s\n", ioc->name,
-                    __FUNCTION__, (rc == 0) ? "success" : "failed");
+                       __func__, (rc == 0) ? "success" : "failed");
                 ioc_raw_state = mpt_GetIocState(ioc, 0);
                 if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT)
                         printk(MYIOC_s_WARN_FMT "IOC is in FAULT state after "
@@ -356,7 +356,7 @@ mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa)
         if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||
                 MptCallbacks[cb_idx] == NULL) {
                 printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
-                                __FUNCTION__, ioc->name, cb_idx);
+                                __func__, ioc->name, cb_idx);
                 goto out;
         }
 
@@ -420,7 +420,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)
         if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||
                 MptCallbacks[cb_idx] == NULL) {
                 printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
-                                __FUNCTION__, ioc->name, cb_idx);
+                                __func__, ioc->name, cb_idx);
                 freeme = 0;
                 goto out;
         }
@@ -2434,7 +2434,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
 
         if (ioc->cached_fw != NULL) {
                 ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: Pushing FW onto "
-                    "adapter\n", __FUNCTION__, ioc->name));
+                    "adapter\n", __func__, ioc->name));
                 if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *)
                     ioc->cached_fw, CAN_SLEEP)) < 0) {
                         printk(MYIOC_s_WARN_FMT
@@ -3693,7 +3693,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
 
         if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078) {
                 drsprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: Doorbell=%p; 1078 reset "
-                        "address=%p\n",  ioc->name, __FUNCTION__,
+                        "address=%p\n",  ioc->name, __func__,
                         &ioc->chip->Doorbell, &ioc->chip->Reset_1078));
                 CHIPREG_WRITE32(&ioc->chip->Reset_1078, 0x07);
                 if (sleepFlag == CAN_SLEEP)
@@ -4742,12 +4742,12 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
                 break;
         }
 
-        printk("%s: persist_opcode=%x\n",__FUNCTION__, persist_opcode);
+        printk("%s: persist_opcode=%x\n",__func__, persist_opcode);
 
         /* Get a MF for this command.
          */
         if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
-                printk("%s: no msg frames!\n",__FUNCTION__);
+                printk("%s: no msg frames!\n",__func__);
                 return -1;
         }
 
@@ -4771,13 +4771,13 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
             (SasIoUnitControlReply_t *)ioc->persist_reply_frame;
         if (le16_to_cpu(sasIoUnitCntrReply->IOCStatus) != MPI_IOCSTATUS_SUCCESS) {
                 printk("%s: IOCStatus=0x%X IOCLogInfo=0x%X\n",
-                    __FUNCTION__,
+                    __func__,
                     sasIoUnitCntrReply->IOCStatus,
                     sasIoUnitCntrReply->IOCLogInfo);
                 return -1;
         }
 
-        printk("%s: success\n",__FUNCTION__);
+        printk("%s: success\n",__func__);
         return 0;
 }
 
@@ -5784,7 +5784,7 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp)
 
         if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
-                    ioc->name,__FUNCTION__));
+                    ioc->name,__func__));
                 return -1;
         }
 
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index a5920423e2b2..f5233f3d9eff 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -505,7 +505,7 @@ mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
         event = le32_to_cpu(pEvReply->Event) & 0xFF;
 
         dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s() called\n",
-            ioc->name, __FUNCTION__));
+            ioc->name, __func__));
         if(async_queue == NULL)
                 return 1;
 
@@ -2482,7 +2482,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
          */
         if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
-                    ioc->name,__FUNCTION__));
+                    ioc->name,__func__));
                 goto out;
         }
 
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index b36cae9ec6db..c3c24fdf9fb6 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -231,28 +231,28 @@ static int
 mptfc_abort(struct scsi_cmnd *SCpnt)
 {
         return
-            mptfc_block_error_handler(SCpnt, mptscsih_abort, __FUNCTION__);
+            mptfc_block_error_handler(SCpnt, mptscsih_abort, __func__);
 }
 
 static int
 mptfc_dev_reset(struct scsi_cmnd *SCpnt)
 {
         return
-            mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __FUNCTION__);
+            mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __func__);
 }
 
 static int
 mptfc_bus_reset(struct scsi_cmnd *SCpnt)
 {
         return
-            mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __FUNCTION__);
+            mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __func__);
 }
 
 static int
 mptfc_host_reset(struct scsi_cmnd *SCpnt)
 {
         return
-            mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __FUNCTION__);
+            mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __func__);
 }
 
 static void
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index d709d92b7b30..a1abf95cf751 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -610,7 +610,7 @@ mpt_lan_send_turbo(struct net_device *dev, u32 tmsg)
 
         dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
                         IOC_AND_NETDEV_NAMES_s_s(dev),
-                        __FUNCTION__, sent));
+                        __func__, sent));
 
         priv->SendCtl[ctx].skb = NULL;
         pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@@ -676,7 +676,7 @@ mpt_lan_send_reply(struct net_device *dev, LANSendReply_t *pSendRep)
 
                 dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
                                 IOC_AND_NETDEV_NAMES_s_s(dev),
-                                __FUNCTION__, sent));
+                                __func__, sent));
 
                 priv->SendCtl[ctx].skb = NULL;
                 pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@@ -715,7 +715,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
         u16 cur_naa = 0x1000;
 
         dioprintk((KERN_INFO MYNAM ": %s called, skb_addr = %p\n",
-                        __FUNCTION__, skb));
+                        __func__, skb));
 
         spin_lock_irqsave(&priv->txfidx_lock, flags);
         if (priv->mpt_txfidx_tail < 0) {
@@ -723,7 +723,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
                 spin_unlock_irqrestore(&priv->txfidx_lock, flags);
 
                 printk (KERN_ERR "%s: no tx context available: %u\n",
-                        __FUNCTION__, priv->mpt_txfidx_tail);
+                        __func__, priv->mpt_txfidx_tail);
                 return 1;
         }
 
@@ -733,7 +733,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
                 spin_unlock_irqrestore(&priv->txfidx_lock, flags);
 
                 printk (KERN_ERR "%s: Unable to alloc request frame\n",
-                        __FUNCTION__);
+                        __func__);
                 return 1;
         }
 
@@ -1208,7 +1208,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
 
         dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, Start_buckets = %u, buckets_out = %u\n",
                         IOC_AND_NETDEV_NAMES_s_s(dev),
-                        __FUNCTION__, buckets, curr));
+                        __func__, buckets, curr));
 
         max = (mpt_dev->req_sz - MPT_LAN_RECEIVE_POST_REQUEST_SIZE) /
                         (MPT_LAN_TRANSACTION32_SIZE + sizeof(SGESimple64_t));
@@ -1217,9 +1217,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
                 mf = mpt_get_msg_frame(LanCtx, mpt_dev);
                 if (mf == NULL) {
                         printk (KERN_ERR "%s: Unable to alloc request frame\n",
-                                __FUNCTION__);
+                                __func__);
                         dioprintk((KERN_ERR "%s: %u buckets remaining\n",
-                                 __FUNCTION__, buckets));
+                                 __func__, buckets));
                         goto out;
                 }
                 pRecvReq = (LANReceivePostRequest_t *) mf;
@@ -1244,7 +1244,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
                         spin_lock_irqsave(&priv->rxfidx_lock, flags);
                         if (priv->mpt_rxfidx_tail < 0) {
                                 printk (KERN_ERR "%s: Can't alloc context\n",
-                                        __FUNCTION__);
+                                        __func__);
                                 spin_unlock_irqrestore(&priv->rxfidx_lock,
                                                        flags);
                                 break;
@@ -1267,7 +1267,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
                                 if (skb == NULL) {
                                         printk (KERN_WARNING
                                                 MYNAM "/%s: Can't alloc skb\n",
-                                                __FUNCTION__);
+                                                __func__);
                                         priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx;
                                         spin_unlock_irqrestore(&priv->rxfidx_lock, flags);
                                         break;
@@ -1305,7 +1305,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
 
                 if (pSimple == NULL) {
 /**/                    printk (KERN_WARNING MYNAM "/%s: No buckets posted\n",
-/**/                            __FUNCTION__);
+/**/                            __func__);
                         mpt_free_msg_frame(mpt_dev, mf);
                         goto out;
                 }
@@ -1329,9 +1329,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
 
 out:
         dioprintk((KERN_INFO MYNAM "/%s: End_buckets = %u, priv->buckets_out = %u\n",
-                  __FUNCTION__, buckets, atomic_read(&priv->buckets_out)));
+                  __func__, buckets, atomic_read(&priv->buckets_out)));
         dioprintk((KERN_INFO MYNAM "/%s: Posted %u buckets and received %u back\n",
-        __FUNCTION__, priv->total_posted, priv->total_received));
+        __func__, priv->total_posted, priv->total_received));
 
         clear_bit(0, &priv->post_buckets_active);
 }
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index b1147aa7afde..12b732512e57 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -300,7 +300,7 @@ mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_detai
         phy_info = port_info->phy_info;
 
         dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: [%p]: num_phys=%02d "
-            "bitmask=0x%016llX\n", ioc->name, __FUNCTION__, port_details,
+            "bitmask=0x%016llX\n", ioc->name, __func__, port_details,
             port_details->num_phys, (unsigned long long)
             port_details->phy_bitmask));
 
@@ -411,7 +411,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
                  */
                 dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                     "%s: [%p]: deleting phy = %d\n",
-                    ioc->name, __FUNCTION__, port_details, i));
+                    ioc->name, __func__, port_details, i));
                 port_details->num_phys--;
                 port_details->phy_bitmask &= ~ (1 << phy_info->phy_id);
                 memset(&phy_info->attached, 0, sizeof(struct mptsas_devinfo));
@@ -497,7 +497,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
                         continue;
                 dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                     "%s: [%p]: phy_id=%02d num_phys=%02d "
-                    "bitmask=0x%016llX\n", ioc->name, __FUNCTION__,
+                    "bitmask=0x%016llX\n", ioc->name, __func__,
                     port_details, i, port_details->num_phys,
                     (unsigned long long)port_details->phy_bitmask));
                 dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "\t\tport = %p rphy=%p\n",
@@ -553,7 +553,7 @@ mptsas_target_reset(MPT_ADAPTER *ioc, u8 channel, u8 id)
 
         if ((mf = mpt_get_msg_frame(ioc->TaskCtx, ioc)) == NULL) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames @%d!!\n",
-                    ioc->name,__FUNCTION__, __LINE__));
+                    ioc->name,__func__, __LINE__));
                 return 0;
         }
 
@@ -606,7 +606,7 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc,
             GFP_ATOMIC);
         if (!target_reset_list) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n",
-                    ioc->name,__FUNCTION__, __LINE__));
+                    ioc->name,__func__, __LINE__));
                 return;
         }
 
@@ -673,7 +673,7 @@ mptsas_dev_reset_complete(MPT_ADAPTER *ioc)
         ev = kzalloc(sizeof(*ev), GFP_ATOMIC);
         if (!ev) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n",
-                    ioc->name,__FUNCTION__, __LINE__));
+                    ioc->name,__func__, __LINE__));
                 return;
         }
 
@@ -1183,7 +1183,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
         reply = (SasIoUnitControlReply_t *)ioc->sas_mgmt.reply;
         if (reply->IOCStatus != MPI_IOCSTATUS_SUCCESS) {
                 printk(MYIOC_s_INFO_FMT "%s: IOCStatus=0x%X IOCLogInfo=0x%X\n",
-                    ioc->name, __FUNCTION__, reply->IOCStatus, reply->IOCLogInfo);
+                    ioc->name, __func__, reply->IOCStatus, reply->IOCLogInfo);
                 error = -ENXIO;
                 goto out_unlock;
         }
@@ -1270,14 +1270,14 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         if (!rsp) {
                 printk(MYIOC_s_ERR_FMT "%s: the smp response space is missing\n",
-                    ioc->name, __FUNCTION__);
+                    ioc->name, __func__);
                 return -EINVAL;
         }
 
         /* do we need to support multiple segments? */
         if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
                 printk(MYIOC_s_ERR_FMT "%s: multiple segments req %u %u, rsp %u %u\n",
-                    ioc->name, __FUNCTION__, req->bio->bi_vcnt, req->data_len,
+                    ioc->name, __func__, req->bio->bi_vcnt, req->data_len,
                     rsp->bio->bi_vcnt, rsp->data_len);
                 return -EINVAL;
         }
@@ -1343,7 +1343,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         timeleft = wait_for_completion_timeout(&ioc->sas_mgmt.done, 10 * HZ);
         if (!timeleft) {
-                printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __FUNCTION__);
+                printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __func__);
                 /* On timeout reset the board */
                 mpt_HardResetHandler(ioc, CAN_SLEEP);
                 ret = -ETIMEDOUT;
@@ -1361,7 +1361,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                 rsp->data_len -= smprep->ResponseDataLength;
         } else {
                 printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
-                    ioc->name, __FUNCTION__);
+                    ioc->name, __func__);
                 ret = -ENXIO;
         }
 unmap:
@@ -2006,7 +2006,7 @@ static int mptsas_probe_one_phy(struct device *dev,
                         if (error) {
                                 dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                         "%s: exit at line=%d\n", ioc->name,
-                                        __FUNCTION__, __LINE__));
+                                        __func__, __LINE__));
                                 goto out;
                         }
                         mptsas_set_port(ioc, phy_info, port);
@@ -2076,7 +2076,7 @@ static int mptsas_probe_one_phy(struct device *dev,
                 if (!rphy) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         goto out;
                 }
 
@@ -2085,7 +2085,7 @@ static int mptsas_probe_one_phy(struct device *dev,
                 if (error) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         sas_rphy_free(rphy);
                         goto out;
                 }
@@ -2613,7 +2613,7 @@ mptsas_hotplug_work(struct work_struct *work)
                                     (ev->channel << 8) + ev->id)) {
                                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                         "%s: exit at line=%d\n", ioc->name,
-                                                __FUNCTION__, __LINE__));
+                                                __func__, __LINE__));
                                         break;
                                 }
                                 phy_info = mptsas_find_phyinfo_by_sas_address(
@@ -2633,20 +2633,20 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (!phy_info){
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
                 if (!phy_info->port_details) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
                 rphy = mptsas_get_rphy(phy_info);
                 if (!rphy) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
 
@@ -2654,7 +2654,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (!port) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
 
@@ -2665,7 +2665,7 @@ mptsas_hotplug_work(struct work_struct *work)
                         if (!vtarget) {
                                 dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                         "%s: exit at line=%d\n", ioc->name,
-                                        __FUNCTION__, __LINE__));
+                                        __func__, __LINE__));
                                 break;
                         }
 
@@ -2720,7 +2720,7 @@ mptsas_hotplug_work(struct work_struct *work)
                         (ev->channel << 8) + ev->id)) {
                                 dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                         "%s: exit at line=%d\n", ioc->name,
-                                        __FUNCTION__, __LINE__));
+                                        __func__, __LINE__));
                         break;
                 }
 
@@ -2732,7 +2732,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (!phy_info || !phy_info->port_details) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
 
@@ -2744,7 +2744,7 @@ mptsas_hotplug_work(struct work_struct *work)
                         if (!vtarget) {
                                 dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                     "%s: exit at line=%d\n", ioc->name,
-                                    __FUNCTION__, __LINE__));
+                                    __func__, __LINE__));
                                 break;
                         }
                         /*
@@ -2767,7 +2767,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (mptsas_get_rphy(phy_info)) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         if (ev->channel) printk("%d\n", __LINE__);
                         break;
                 }
@@ -2776,7 +2776,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (!port) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break;
                 }
                 memcpy(&phy_info->attached, &sas_device,
@@ -2801,7 +2801,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (!rphy) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         break; /* non-fatal: an rphy can be added later */
                 }
 
@@ -2809,7 +2809,7 @@ mptsas_hotplug_work(struct work_struct *work)
                 if (sas_rphy_add(rphy)) {
                         dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
                                 "%s: exit at line=%d\n", ioc->name,
-                                __FUNCTION__, __LINE__));
+                                __func__, __LINE__));
                         sas_rphy_free(rphy);
                         break;
                 }
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index d142b6b4b976..9f9354fd3516 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -461,7 +461,7 @@ mptscsih_issue_sep_command(MPT_ADAPTER *ioc, VirtTarget *vtarget,
 
         if ((mf = mpt_get_msg_frame(ioc->InternalCtx, ioc)) == NULL) {
                 dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: no msg frames!!\n",
-                    ioc->name,__FUNCTION__));
+                    ioc->name,__func__));
                 return;
         }
 
@@ -2187,7 +2187,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *m
                                 (ioc->debug_level & MPT_DEBUG_TM ))
                 printk("%s: ha=%d [%d:%d:0] task_type=0x%02X "
                         "iocstatus=0x%04X\n\tloginfo=0x%08X response_code=0x%02X "
-                        "term_cmnds=%d\n", __FUNCTION__, ioc->id, pScsiTmReply->Bus,
+                        "term_cmnds=%d\n", __func__, ioc->id, pScsiTmReply->Bus,
                          pScsiTmReply->TargetID, pScsiTmReq->TaskType,
                         le16_to_cpu(pScsiTmReply->IOCStatus),
                         le32_to_cpu(pScsiTmReply->IOCLogInfo),pScsiTmReply->ResponseCode,
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index eabf0bfccab4..c6408a62d95e 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -256,28 +256,28 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
                                       bank + ASIC3_GPIO_TRIGGER_TYPE);
         asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit;
 
-        if (type == IRQT_RISING) {
+        if (type == IRQ_TYPE_EDGE_RISING) {
                 trigger |= bit;
                 edge |= bit;
-        } else if (type == IRQT_FALLING) {
+        } else if (type == IRQ_TYPE_EDGE_FALLING) {
                 trigger |= bit;
                 edge &= ~bit;
-        } else if (type == IRQT_BOTHEDGE) {
+        } else if (type == IRQ_TYPE_EDGE_BOTH) {
                 trigger |= bit;
                 if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base))
                         edge &= ~bit;
                 else
                         edge |= bit;
                 asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit;
-        } else if (type == IRQT_LOW) {
+        } else if (type == IRQ_TYPE_LEVEL_LOW) {
                 trigger &= ~bit;
                 level &= ~bit;
-        } else if (type == IRQT_HIGH) {
+        } else if (type == IRQ_TYPE_LEVEL_HIGH) {
                 trigger &= ~bit;
                 level |= bit;
         } else {
                 /*
-                 * if type == IRQT_NOEDGE, we should mask interrupts, but
+                 * if type == IRQ_TYPE_NONE, we should mask interrupts, but
                  * be careful to not unmask them if mask was also called.
                  * Probably need internal state for mask.
                  */
@@ -343,7 +343,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
                              ASIC3_INTMASK_GINTMASK);
 
         set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);
-        set_irq_type(asic->irq_nr, IRQT_RISING);
+        set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
         set_irq_data(asic->irq_nr, asic);
 
         return 0;
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 0454be4266c1..9c9c126ed334 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -15,24 +15,24 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
 
-static int mfd_add_device(struct platform_device *parent,
-                const struct mfd_cell *cell,
-                struct resource *mem_base,
-                int irq_base)
+static int mfd_add_device(struct device *parent, int id,
+                          const struct mfd_cell *cell,
+                          struct resource *mem_base,
+                          int irq_base)
 {
         struct resource res[cell->num_resources];
         struct platform_device *pdev;
         int ret = -ENOMEM;
         int r;
 
-        pdev = platform_device_alloc(cell->name, parent->id);
+        pdev = platform_device_alloc(cell->name, id);
         if (!pdev)
                 goto fail_alloc;
 
-        pdev->dev.parent = &parent->dev;
+        pdev->dev.parent = parent;
 
         ret = platform_device_add_data(pdev,
-                        cell, sizeof(struct mfd_cell));
+                        cell->platform_data, cell->data_size);
         if (ret)
                 goto fail_device;
 
@@ -75,17 +75,16 @@ fail_alloc:
         return ret;
 }
 
-int mfd_add_devices(
-                struct platform_device *parent,
-                const struct mfd_cell *cells, int n_devs,
-                struct resource *mem_base,
-                int irq_base)
+int mfd_add_devices(struct device *parent, int id,
+                    const struct mfd_cell *cells, int n_devs,
+                    struct resource *mem_base,
+                    int irq_base)
 {
         int i;
         int ret = 0;
 
         for (i = 0; i < n_devs; i++) {
-                ret = mfd_add_device(parent, cells + i, mem_base, irq_base);
+                ret = mfd_add_device(parent, id, cells + i, mem_base, irq_base);
                 if (ret)
                         break;
         }
@@ -99,14 +98,13 @@ EXPORT_SYMBOL(mfd_add_devices);
 
 static int mfd_remove_devices_fn(struct device *dev, void *unused)
 {
-        platform_device_unregister(
-                        container_of(dev, struct platform_device, dev));
+        platform_device_unregister(to_platform_device(dev));
         return 0;
 }
 
-void mfd_remove_devices(struct platform_device *parent)
+void mfd_remove_devices(struct device *parent)
 {
-        device_for_each_child(&parent->dev, NULL, mfd_remove_devices_fn);
+        device_for_each_child(parent, NULL, mfd_remove_devices_fn);
 }
 EXPORT_SYMBOL(mfd_remove_devices);
 
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 2d87501b6fd4..f4fd797c1590 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -324,7 +324,7 @@ static void tc6393xb_attach_irq(struct platform_device *dev)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        set_irq_type(tc6393xb->irq, IRQT_FALLING);
+        set_irq_type(tc6393xb->irq, IRQ_TYPE_EDGE_FALLING);
         set_irq_data(tc6393xb->irq, tc6393xb);
         set_irq_chained_handler(tc6393xb->irq, tc6393xb_irq);
 }
@@ -466,8 +466,12 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
                 tc6393xb_attach_irq(dev);
 
         tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd->nand_data;
+        tc6393xb_cells[TC6393XB_CELL_NAND].platform_data =
+                &tc6393xb_cells[TC6393XB_CELL_NAND];
+        tc6393xb_cells[TC6393XB_CELL_NAND].data_size =
+                sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);
 
-        retval = mfd_add_devices(dev,
+        retval = mfd_add_devices(&dev->dev, dev->id,
                         tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),
                         iomem, tcpd->irq_base);
 
@@ -501,7 +505,7 @@ static int __devexit tc6393xb_remove(struct platform_device *dev)
         struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
         int ret;
 
-        mfd_remove_devices(dev);
+        mfd_remove_devices(&dev->dev);
 
         if (tc6393xb->irq)
                 tc6393xb_detach_irq(dev);
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 321eb9134635..f5ade1904aad 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -360,7 +360,7 @@ config THINKPAD_ACPI_VIDEO
           If you are not sure, say Y here.
 
 config THINKPAD_ACPI_HOTKEY_POLL
-        bool "Suport NVRAM polling for hot keys"
+        bool "Support NVRAM polling for hot keys"
         depends on THINKPAD_ACPI
         default y
         ---help---
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index e171650766ce..bf5e4d065436 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/atmel-ssc.h>
 
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index 579b01ff82d4..c3b4227f48a5 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -229,11 +229,10 @@ xpc_hb_checker(void *ignore)
         int last_IRQ_count = 0;
         int new_IRQ_count;
         int force_IRQ = 0;
-        cpumask_of_cpu_ptr(cpumask, XPC_HB_CHECK_CPU);
 
         /* this thread was marked active by xpc_hb_init() */
 
-        set_cpus_allowed_ptr(current, cpumask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(XPC_HB_CHECK_CPU));
 
         /* set our heartbeating to other partitions into motion */
         xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ);
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index b68381f7bfdd..992b4beb757c 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -11,6 +11,8 @@
 #include <linux/clk.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
@@ -27,7 +29,6 @@
 #include <asm/unaligned.h>
 
 #include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
 
 #include "atmel-mci-regs.h"
 
@@ -573,7 +574,7 @@ static int atmci_get_ro(struct mmc_host *mmc)
         int                     read_only = 0;
         struct atmel_mci        *host = mmc_priv(mmc);
 
-        if (host->wp_pin >= 0) {
+        if (gpio_is_valid(host->wp_pin)) {
                 read_only = gpio_get_value(host->wp_pin);
                 dev_dbg(&mmc->class_dev, "card is %s\n",
                                 read_only ? "read-only" : "read-write");
@@ -635,7 +636,7 @@ static void atmci_detect_change(unsigned long data)
          * been freed.
          */
         smp_rmb();
-        if (host->detect_pin < 0)
+        if (!gpio_is_valid(host->detect_pin))
                 return;
 
         enable_irq(gpio_to_irq(host->detect_pin));
@@ -1050,7 +1051,7 @@ static int __init atmci_probe(struct platform_device *pdev)
 
         /* Assume card is present if we don't have a detect pin */
         host->present = 1;
-        if (host->detect_pin >= 0) {
+        if (gpio_is_valid(host->detect_pin)) {
                 if (gpio_request(host->detect_pin, "mmc_detect")) {
                         dev_dbg(&mmc->class_dev, "no detect pin available\n");
                         host->detect_pin = -1;
@@ -1058,7 +1059,7 @@ static int __init atmci_probe(struct platform_device *pdev)
                         host->present = !gpio_get_value(host->detect_pin);
                 }
         }
-        if (host->wp_pin >= 0) {
+        if (gpio_is_valid(host->wp_pin)) {
                 if (gpio_request(host->wp_pin, "mmc_wp")) {
                         dev_dbg(&mmc->class_dev, "no WP pin available\n");
                         host->wp_pin = -1;
@@ -1069,7 +1070,7 @@ static int __init atmci_probe(struct platform_device *pdev)
 
         mmc_add_host(mmc);
 
-        if (host->detect_pin >= 0) {
+        if (gpio_is_valid(host->detect_pin)) {
                 setup_timer(&host->detect_timer, atmci_detect_change,
                                 (unsigned long)host);
 
@@ -1112,7 +1113,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
         if (host) {
                 /* Debugfs stuff is cleaned up by mmc core */
 
-                if (host->detect_pin >= 0) {
+                if (gpio_is_valid(host->detect_pin)) {
                         int pin = host->detect_pin;
 
                         /* Make sure the timer doesn't enable the interrupt */
@@ -1132,7 +1133,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
                 mci_readl(host, SR);
                 clk_disable(host->mck);
 
-                if (host->wp_pin >= 0)
+                if (gpio_is_valid(host->wp_pin))
                         gpio_free(host->wp_pin);
 
                 free_irq(platform_get_irq(pdev, 0), host->mmc);
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 91ec9fdc7184..a03fe1fb61ca 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -260,7 +260,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
                 dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
                                 pool->buff_size, DMA_FROM_DEVICE);
 
-                if (dma_mapping_error((&adapter->vdev->dev, dma_addr))
+                if (dma_mapping_error(&adapter->vdev->dev, dma_addr))
                         goto failure;
 
                 pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
@@ -294,7 +294,7 @@ failure:
                 pool->consumer_index = pool->size - 1;
         else
                 pool->consumer_index--;
-        if (!dma_mapping_error((&adapter->vdev->dev, dma_addr))
+        if (!dma_mapping_error(&adapter->vdev->dev, dma_addr))
                 dma_unmap_single(&adapter->vdev->dev,
                                  pool->dma_addr[index], pool->buff_size,
                                  DMA_FROM_DEVICE);
@@ -488,7 +488,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
                                                  &adapter->rx_buff_pool[i]);
 
         if (adapter->bounce_buffer != NULL) {
-                if (!dma_mapping_error(adapter->bounce_buffer_dma)) {
+                if (!dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
                         dma_unmap_single(&adapter->vdev->dev,
                                         adapter->bounce_buffer_dma,
                                         adapter->netdev->mtu + IBMVETH_BUFF_OH,
@@ -924,7 +924,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 buf[1] = 0;
         }
 
-        if (dma_mapping_error((&adapter->vdev->dev, data_dma_addr)) {
+        if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) {
                 if (!firmware_has_feature(FW_FEATURE_CMO))
                         ibmveth_error_printk("tx: unable to map xmit buffer\n");
                 skb_copy_from_linear_data(skb, adapter->bounce_buffer,
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 1d7ec3129349..f821dbc952a4 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -13,3 +13,9 @@ config OF_I2C
         depends on PPC_OF && I2C
         help
           OpenFirmware I2C accessors
+
+config OF_SPI
+        def_tristate SPI
+        depends on OF && PPC_OF && SPI
+        help
+          OpenFirmware SPI accessors
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 548772e871fd..4c3c6f8e36f5 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -2,3 +2,4 @@ obj-y = base.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)    += of_i2c.o
+obj-$(CONFIG_OF_SPI)    += of_spi.o
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 23ffb7c0caf2..ad8ac1a8af28 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -385,3 +385,91 @@ struct device_node *of_find_matching_node(struct device_node *from,
         return np;
 }
 EXPORT_SYMBOL(of_find_matching_node);
+
+/**
+ * of_modalias_table: Table of explicit compatible ==> modalias mappings
+ *
+ * This table allows particulare compatible property values to be mapped
+ * to modalias strings.  This is useful for busses which do not directly
+ * understand the OF device tree but are populated based on data contained
+ * within the device tree.  SPI and I2C are the two current users of this
+ * table.
+ *
+ * In most cases, devices do not need to be listed in this table because
+ * the modalias value can be derived directly from the compatible table.
+ * However, if for any reason a value cannot be derived, then this table
+ * provides a method to override the implicit derivation.
+ *
+ * At the moment, a single table is used for all bus types because it is
+ * assumed that the data size is small and that the compatible values
+ * should already be distinct enough to differentiate between SPI, I2C
+ * and other devices.
+ */
+struct of_modalias_table {
+        char *of_device;
+        char *modalias;
+};
+static struct of_modalias_table of_modalias_table[] = {
+        /* Empty for now; add entries as needed */
+};
+
+/**
+ * of_modalias_node - Lookup appropriate modalias for a device node
+ * @node:       pointer to a device tree node
+ * @modalias:   Pointer to buffer that modalias value will be copied into
+ * @len:        Length of modalias value
+ *
+ * Based on the value of the compatible property, this routine will determine
+ * an appropriate modalias value for a particular device tree node.  Three
+ * separate methods are used to derive a modalias value.
+ *
+ * First method is to lookup the compatible value in of_modalias_table.
+ * Second is to look for a "linux,<modalias>" entry in the compatible list
+ * and used that for modalias.  Third is to strip off the manufacturer
+ * prefix from the first compatible entry and use the remainder as modalias
+ *
+ * This routine returns 0 on success
+ */
+int of_modalias_node(struct device_node *node, char *modalias, int len)
+{
+        int i, cplen;
+        const char *compatible;
+        const char *p;
+
+        /* 1. search for exception list entry */
+        for (i = 0; i < ARRAY_SIZE(of_modalias_table); i++) {
+                compatible = of_modalias_table[i].of_device;
+                if (!of_device_is_compatible(node, compatible))
+                        continue;
+                strlcpy(modalias, of_modalias_table[i].modalias, len);
+                return 0;
+        }
+
+        compatible = of_get_property(node, "compatible", &cplen);
+        if (!compatible)
+                return -ENODEV;
+
+        /* 2. search for linux,<modalias> entry */
+        p = compatible;
+        while (cplen > 0) {
+                if (!strncmp(p, "linux,", 6)) {
+                        p += 6;
+                        strlcpy(modalias, p, len);
+                        return 0;
+                }
+
+                i = strlen(p) + 1;
+                p += i;
+                cplen -= i;
+        }
+
+        /* 3. take first compatible entry and strip manufacturer */
+        p = strchr(compatible, ',');
+        if (!p)
+                return -ENODEV;
+        p++;
+        strlcpy(modalias, p, len);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(of_modalias_node);
+
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index 344e1b03dd8b..6a98dc8aa30b 100644
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -16,62 +16,6 @@
 #include <linux/of_i2c.h>
 #include <linux/module.h>
 
-struct i2c_driver_device {
-        char    *of_device;
-        char    *i2c_type;
-};
-
-static struct i2c_driver_device i2c_devices[] = {
-};
-
-static int of_find_i2c_driver(struct device_node *node,
-                              struct i2c_board_info *info)
-{
-        int i, cplen;
-        const char *compatible;
-        const char *p;
-
-        /* 1. search for exception list entry */
-        for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
-                if (!of_device_is_compatible(node, i2c_devices[i].of_device))
-                        continue;
-                if (strlcpy(info->type, i2c_devices[i].i2c_type,
-                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-                        return -ENOMEM;
-
-                return 0;
-        }
-
-        compatible = of_get_property(node, "compatible", &cplen);
-        if (!compatible)
-                return -ENODEV;
-
-        /* 2. search for linux,<i2c-type> entry */
-        p = compatible;
-        while (cplen > 0) {
-                if (!strncmp(p, "linux,", 6)) {
-                        p += 6;
-                        if (strlcpy(info->type, p,
-                                    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-                                return -ENOMEM;
-                        return 0;
-                }
-
-                i = strlen(p) + 1;
-                p += i;
-                cplen -= i;
-        }
-
-        /* 3. take fist compatible entry and strip manufacturer */
-        p = strchr(compatible, ',');
-        if (!p)
-                return -ENODEV;
-        p++;
-        if (strlcpy(info->type, p, I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-                return -ENOMEM;
-        return 0;
-}
-
 void of_register_i2c_devices(struct i2c_adapter *adap,
                              struct device_node *adap_node)
 {
@@ -83,6 +27,9 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
                 const u32 *addr;
                 int len;
 
+                if (of_modalias_node(node, info.type, sizeof(info.type)) < 0)
+                        continue;
+
                 addr = of_get_property(node, "reg", &len);
                 if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
                         printk(KERN_ERR
@@ -92,11 +39,6 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
 
                 info.irq = irq_of_parse_and_map(node, 0);
 
-                if (of_find_i2c_driver(node, &info) < 0) {
-                        irq_dispose_mapping(info.irq);
-                        continue;
-                }
-
                 info.addr = *addr;
 
                 request_module(info.type);
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
new file mode 100644
index 000000000000..b01eec026f68
--- /dev/null
+++ b/drivers/of/of_spi.c
@@ -0,0 +1,93 @@
+/*
+ * SPI OF support routines
+ * Copyright (C) 2008 Secret Lab Technologies Ltd.
+ *
+ * Support routines for deriving SPI device attachments from the device
+ * tree.
+ */
+
+#include <linux/of.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/of_spi.h>
+
+/**
+ * of_register_spi_devices - Register child devices onto the SPI bus
+ * @master:     Pointer to spi_master device
+ * @np:         parent node of SPI device nodes
+ *
+ * Registers an spi_device for each child node of 'np' which has a 'reg'
+ * property.
+ */
+void of_register_spi_devices(struct spi_master *master, struct device_node *np)
+{
+        struct spi_device *spi;
+        struct device_node *nc;
+        const u32 *prop;
+        int rc;
+        int len;
+
+        for_each_child_of_node(np, nc) {
+                /* Alloc an spi_device */
+                spi = spi_alloc_device(master);
+                if (!spi) {
+                        dev_err(&master->dev, "spi_device alloc error for %s\n",
+                                nc->full_name);
+                        spi_dev_put(spi);
+                        continue;
+                }
+
+                /* Select device driver */
+                if (of_modalias_node(nc, spi->modalias,
+                                     sizeof(spi->modalias)) < 0) {
+                        dev_err(&master->dev, "cannot find modalias for %s\n",
+                                nc->full_name);
+                        spi_dev_put(spi);
+                        continue;
+                }
+
+                /* Device address */
+                prop = of_get_property(nc, "reg", &len);
+                if (!prop || len < sizeof(*prop)) {
+                        dev_err(&master->dev, "%s has no 'reg' property\n",
+                                nc->full_name);
+                        spi_dev_put(spi);
+                        continue;
+                }
+                spi->chip_select = *prop;
+
+                /* Mode (clock phase/polarity/etc.) */
+                if (of_find_property(nc, "spi-cpha", NULL))
+                        spi->mode |= SPI_CPHA;
+                if (of_find_property(nc, "spi-cpol", NULL))
+                        spi->mode |= SPI_CPOL;
+
+                /* Device speed */
+                prop = of_get_property(nc, "spi-max-frequency", &len);
+                if (!prop || len < sizeof(*prop)) {
+                        dev_err(&master->dev, "%s has no 'spi-max-frequency' property\n",
+                                nc->full_name);
+                        spi_dev_put(spi);
+                        continue;
+                }
+                spi->max_speed_hz = *prop;
+
+                /* IRQ */
+                spi->irq = irq_of_parse_and_map(nc, 0);
+
+                /* Store a pointer to the node in the device structure */
+                of_node_get(nc);
+                spi->dev.archdata.of_node = nc;
+
+                /* Register the new device */
+                request_module(spi->modalias);
+                rc = spi_add_device(spi);
+                if (rc) {
+                        dev_err(&master->dev, "spi_device register error %s\n",
+                                nc->full_name);
+                        spi_dev_put(spi);
+                }
+
+        }
+}
+EXPORT_SYMBOL(of_register_spi_devices);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 1323a43285d7..ad27e9e225a6 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1103,7 +1103,7 @@ static inline void dbg_ctrl(struct controller *ctrl)
         dbg("  Power Indicator      : %3s\n", PWR_LED(ctrl)    ? "yes" : "no");
         dbg("  Hot-Plug Surprise    : %3s\n", HP_SUPR_RM(ctrl) ? "yes" : "no");
         dbg("  EMI Present          : %3s\n", EMI(ctrl)        ? "yes" : "no");
-        dbg("  Comamnd Completed    : %3s\n", NO_CMD_CMPL(ctrl)? "no" : "yes");
+        dbg("  Command Completed    : %3s\n", NO_CMD_CMPL(ctrl)? "no" : "yes");
         pciehp_readw(ctrl, SLOTSTATUS, &reg16);
         dbg("Slot Status            : 0x%04x\n", reg16);
         pciehp_readw(ctrl, SLOTCTRL, &reg16);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 15af618d36e2..18354817173c 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -126,7 +126,16 @@ static void msix_flush_writes(unsigned int irq)
         }
 }
 
-static void msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag)
+/*
+ * PCI 2.3 does not specify mask bits for each MSI interrupt.  Attempting to
+ * mask all MSI interrupts by clearing the MSI enable bit does not work
+ * reliably as devices without an INTx disable bit will then generate a
+ * level IRQ which will never be cleared.
+ *
+ * Returns 1 if it succeeded in masking the interrupt and 0 if the device
+ * doesn't support MSI masking.
+ */
+static int msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag)
 {
         struct msi_desc *entry;
 
@@ -144,8 +153,7 @@ static void msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag)
                         mask_bits |= flag & mask;
                         pci_write_config_dword(entry->dev, pos, mask_bits);
                 } else {
-                        __msi_set_enable(entry->dev, entry->msi_attrib.pos,
-                                         !flag);
+                        return 0;
                 }
                 break;
         case PCI_CAP_ID_MSIX:
@@ -161,6 +169,7 @@ static void msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag)
                 break;
         }
         entry->msi_attrib.masked = !!flag;
+        return 1;
 }
 
 void read_msi_msg(unsigned int irq, struct msi_msg *msg)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7764768b6a0e..89a2f0fa10f9 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/pci-aspm.h>
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acresrc.h>
@@ -372,6 +373,12 @@ static int __init acpi_pci_init(void)
                 printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n");
                 pci_no_msi();
         }
+
+        if (acpi_gbl_FADT.boot_flags & BAF_PCIE_ASPM_CONTROL) {
+                printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");
+                pcie_no_aspm();
+        }
+
         ret = register_acpi_bus_type(&acpi_pci_bus);
         if (ret)
                 return 0;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e9c356236d27..0a3d856833fc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -572,6 +572,10 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
                 if (!ret)
                         pci_update_current_state(dev);
         }
+        /* This device is quirked not to be put into D3, so
+           don't put it in D3 */
+        if (state == PCI_D3hot && (dev->dev_flags & PCI_DEV_FLAGS_NO_D3))
+                return 0;
 
         error = pci_raw_set_power_state(dev, state);
 
@@ -1123,6 +1127,12 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable)
 }
 
 /**
+ * pci_target_state - find an appropriate low power state for a given PCI dev
+ * @dev: PCI device
+ *
+ * Use underlying platform code to find a supported low power state for @dev.
+ * If the platform can't manage @dev, return the deepest state from which it
+ * can generate wake events, based on any available PME info.
  */
 pci_power_t pci_target_state(struct pci_dev *dev)
 {
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f82495583e63..9a7c9e1408a4 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -55,7 +55,7 @@ struct pcie_link_state {
         struct endpoint_state endpoints[8];
 };
 
-static int aspm_disabled;
+static int aspm_disabled, aspm_force;
 static DEFINE_MUTEX(aspm_lock);
 static LIST_HEAD(link_list);
 
@@ -510,6 +510,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 {
         struct pci_dev *child_dev;
         int child_pos;
+        u32 reg32;
 
         /*
          * Some functions in a slot might not all be PCIE functions, very
@@ -519,6 +520,19 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
                 child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP);
                 if (!child_pos)
                         return -EINVAL;
+
+                /*
+                 * Disable ASPM for pre-1.1 PCIe device, we follow MS to use
+                 * RBER bit to determine if a function is 1.1 version device
+                 */
+                pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
+                        &reg32);
+                if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
+                        printk("Pre-1.1 PCIe device detected, "
+                                "disable ASPM for %s. It can be enabled forcedly"
+                                " with 'pcie_aspm=force'\n", pci_name(pdev));
+                        return -EINVAL;
+                }
         }
         return 0;
 }
@@ -802,11 +816,23 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
 
 static int __init pcie_aspm_disable(char *str)
 {
-        aspm_disabled = 1;
+        if (!strcmp(str, "off")) {
+                aspm_disabled = 1;
+                printk(KERN_INFO "PCIe ASPM is disabled\n");
+        } else if (!strcmp(str, "force")) {
+                aspm_force = 1;
+                printk(KERN_INFO "PCIe ASPM is forcedly enabled\n");
+        }
         return 1;
 }
 
-__setup("pcie_noaspm", pcie_aspm_disable);
+__setup("pcie_aspm=", pcie_aspm_disable);
+
+void pcie_no_aspm(void)
+{
+        if (!aspm_force)
+                aspm_disabled = 1;
+}
 
 #ifdef CONFIG_ACPI
 #include <acpi/acpi_bus.h>
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b1724cf31b66..7098dfb07449 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -163,12 +163,9 @@ static inline unsigned int pci_calc_resource_flags(unsigned int flags)
         return IORESOURCE_MEM;
 }
 
-/*
- * Find the extent of a PCI decode..
- */
-static u32 pci_size(u32 base, u32 maxbase, u32 mask)
+static u64 pci_size(u64 base, u64 maxbase, u64 mask)
 {
-        u32 size = mask & maxbase;      /* Find the significant bits */
+        u64 size = mask & maxbase;      /* Find the significant bits */
         if (!size)
                 return 0;
 
@@ -184,135 +181,142 @@ static u32 pci_size(u32 base, u32 maxbase, u32 mask)
         return size;
 }
 
-static u64 pci_size64(u64 base, u64 maxbase, u64 mask)
-{
-        u64 size = mask & maxbase;      /* Find the significant bits */
-        if (!size)
-                return 0;
+enum pci_bar_type {
+        pci_bar_unknown,        /* Standard PCI BAR probe */
+        pci_bar_io,             /* An io port BAR */
+        pci_bar_mem32,          /* A 32-bit memory BAR */
+        pci_bar_mem64,          /* A 64-bit memory BAR */
+};
 
-        /* Get the lowest of them to find the decode size, and
-           from that the extent.  */
-        size = (size & ~(size-1)) - 1;
+static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
+{
+        if ((bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
+                res->flags = bar & ~PCI_BASE_ADDRESS_IO_MASK;
+                return pci_bar_io;
+        }
 
-        /* base == maxbase can be valid only if the BAR has
-           already been programmed with all 1s.  */
-        if (base == maxbase && ((base | size) & mask) != mask)
-                return 0;
+        res->flags = bar & ~PCI_BASE_ADDRESS_MEM_MASK;
 
-        return size;
+        if (res->flags == PCI_BASE_ADDRESS_MEM_TYPE_64)
+                return pci_bar_mem64;
+        return pci_bar_mem32;
 }
 
-static inline int is_64bit_memory(u32 mask)
+/*
+ * If the type is not unknown, we assume that the lowest bit is 'enable'.
+ * Returns 1 if the BAR was 64-bit and 0 if it was 32-bit.
+ */
+static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+                        struct resource *res, unsigned int pos)
 {
-        if ((mask & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) ==
-            (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64))
-                return 1;
-        return 0;
-}
+        u32 l, sz, mask;
 
-static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
-{
-        unsigned int pos, reg, next;
-        u32 l, sz;
-        struct resource *res;
+        mask = type ? ~PCI_ROM_ADDRESS_ENABLE : ~0;
 
-        for(pos=0; pos<howmany; pos = next) {
-                u64 l64;
-                u64 sz64;
-                u32 raw_sz;
+        res->name = pci_name(dev);
 
-                next = pos+1;
-                res = &dev->resource[pos];
-                res->name = pci_name(dev);
-                reg = PCI_BASE_ADDRESS_0 + (pos << 2);
-                pci_read_config_dword(dev, reg, &l);
-                pci_write_config_dword(dev, reg, ~0);
-                pci_read_config_dword(dev, reg, &sz);
-                pci_write_config_dword(dev, reg, l);
-                if (!sz || sz == 0xffffffff)
-                        continue;
-                if (l == 0xffffffff)
-                        l = 0;
-                raw_sz = sz;
-                if ((l & PCI_BASE_ADDRESS_SPACE) ==
-                                PCI_BASE_ADDRESS_SPACE_MEMORY) {
-                        sz = pci_size(l, sz, (u32)PCI_BASE_ADDRESS_MEM_MASK);
-                        /*
-                         * For 64bit prefetchable memory sz could be 0, if the
-                         * real size is bigger than 4G, so we need to check
-                         * szhi for that.
-                         */
-                        if (!is_64bit_memory(l) && !sz)
-                                continue;
-                        res->start = l & PCI_BASE_ADDRESS_MEM_MASK;
-                        res->flags |= l & ~PCI_BASE_ADDRESS_MEM_MASK;
+        pci_read_config_dword(dev, pos, &l);
+        pci_write_config_dword(dev, pos, mask);
+        pci_read_config_dword(dev, pos, &sz);
+        pci_write_config_dword(dev, pos, l);
+
+        /*
+         * All bits set in sz means the device isn't working properly.
+         * If the BAR isn't implemented, all bits must be 0.  If it's a
+         * memory BAR or a ROM, bit 0 must be clear; if it's an io BAR, bit
+         * 1 must be clear.
+         */
+        if (!sz || sz == 0xffffffff)
+                goto fail;
+
+        /*
+         * I don't know how l can have all bits set.  Copied from old code.
+         * Maybe it fixes a bug on some ancient platform.
+         */
+        if (l == 0xffffffff)
+                l = 0;
+
+        if (type == pci_bar_unknown) {
+                type = decode_bar(res, l);
+                res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN;
+                if (type == pci_bar_io) {
+                        l &= PCI_BASE_ADDRESS_IO_MASK;
+                        mask = PCI_BASE_ADDRESS_IO_MASK & 0xffff;
                 } else {
-                        sz = pci_size(l, sz, PCI_BASE_ADDRESS_IO_MASK & 0xffff);
-                        if (!sz)
-                                continue;
-                        res->start = l & PCI_BASE_ADDRESS_IO_MASK;
-                        res->flags |= l & ~PCI_BASE_ADDRESS_IO_MASK;
+                        l &= PCI_BASE_ADDRESS_MEM_MASK;
+                        mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
                 }
-                res->end = res->start + (unsigned long) sz;
-                res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN;
-                if (is_64bit_memory(l)) {
-                        u32 szhi, lhi;
-
-                        pci_read_config_dword(dev, reg+4, &lhi);
-                        pci_write_config_dword(dev, reg+4, ~0);
-                        pci_read_config_dword(dev, reg+4, &szhi);
-                        pci_write_config_dword(dev, reg+4, lhi);
-                        sz64 = ((u64)szhi << 32) | raw_sz;
-                        l64 = ((u64)lhi << 32) | l;
-                        sz64 = pci_size64(l64, sz64, PCI_BASE_ADDRESS_MEM_MASK);
-                        next++;
-#if BITS_PER_LONG == 64
-                        if (!sz64) {
-                                res->start = 0;
-                                res->end = 0;
-                                res->flags = 0;
-                                continue;
-                        }
-                        res->start = l64 & PCI_BASE_ADDRESS_MEM_MASK;
-                        res->end = res->start + sz64;
-#else
-                        if (sz64 > 0x100000000ULL) {
-                                dev_err(&dev->dev, "BAR %d: can't handle 64-bit"
-                                        " BAR\n", pos);
-                                res->start = 0;
-                                res->flags = 0;
-                        } else if (lhi) {
-                                /* 64-bit wide address, treat as disabled */
-                                pci_write_config_dword(dev, reg,
-                                        l & ~(u32)PCI_BASE_ADDRESS_MEM_MASK);
-                                pci_write_config_dword(dev, reg+4, 0);
-                                res->start = 0;
-                                res->end = sz;
-                        }
-#endif
+        } else {
+                res->flags |= (l & IORESOURCE_ROM_ENABLE);
+                l &= PCI_ROM_ADDRESS_MASK;
+                mask = (u32)PCI_ROM_ADDRESS_MASK;
+        }
+
+        if (type == pci_bar_mem64) {
+                u64 l64 = l;
+                u64 sz64 = sz;
+                u64 mask64 = mask | (u64)~0 << 32;
+
+                pci_read_config_dword(dev, pos + 4, &l);
+                pci_write_config_dword(dev, pos + 4, ~0);
+                pci_read_config_dword(dev, pos + 4, &sz);
+                pci_write_config_dword(dev, pos + 4, l);
+
+                l64 |= ((u64)l << 32);
+                sz64 |= ((u64)sz << 32);
+
+                sz64 = pci_size(l64, sz64, mask64);
+
+                if (!sz64)
+                        goto fail;
+
+                if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {
+                        dev_err(&dev->dev, "can't handle 64-bit BAR\n");
+                        goto fail;
+                } else if ((sizeof(resource_size_t) < 8) && l) {
+                        /* Address above 32-bit boundary; disable the BAR */
+                        pci_write_config_dword(dev, pos, 0);
+                        pci_write_config_dword(dev, pos + 4, 0);
+                        res->start = 0;
+                        res->end = sz64;
+                } else {
+                        res->start = l64;
+                        res->end = l64 + sz64;
                 }
+        } else {
+                sz = pci_size(l, sz, mask);
+
+                if (!sz)
+                        goto fail;
+
+                res->start = l;
+                res->end = l + sz;
         }
+
+ out:
+        return (type == pci_bar_mem64) ? 1 : 0;
+ fail:
+        res->flags = 0;
+        goto out;
+}
+
+static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
+{
+        unsigned int pos, reg;
+
+        for (pos = 0; pos < howmany; pos++) {
+                struct resource *res = &dev->resource[pos];
+                reg = PCI_BASE_ADDRESS_0 + (pos << 2);
+                pos += __pci_read_base(dev, pci_bar_unknown, res, reg);
+        }
+
         if (rom) {
+                struct resource *res = &dev->resource[PCI_ROM_RESOURCE];
                 dev->rom_base_reg = rom;
-                res = &dev->resource[PCI_ROM_RESOURCE];
-                res->name = pci_name(dev);
-                pci_read_config_dword(dev, rom, &l);
-                pci_write_config_dword(dev, rom, ~PCI_ROM_ADDRESS_ENABLE);
-                pci_read_config_dword(dev, rom, &sz);
-                pci_write_config_dword(dev, rom, l);
-                if (l == 0xffffffff)
-                        l = 0;
-                if (sz && sz != 0xffffffff) {
-                        sz = pci_size(l, sz, (u32)PCI_ROM_ADDRESS_MASK);
-                        if (sz) {
-                                res->flags = (l & IORESOURCE_ROM_ENABLE) |
-                                  IORESOURCE_MEM | IORESOURCE_PREFETCH |
-                                  IORESOURCE_READONLY | IORESOURCE_CACHEABLE |
-                                  IORESOURCE_SIZEALIGN;
-                                res->start = l & PCI_ROM_ADDRESS_MASK;
-                                res->end = res->start + (unsigned long) sz;
-                        }
-                }
+                res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH |
+                                IORESOURCE_READONLY | IORESOURCE_CACHEABLE |
+                                IORESOURCE_SIZEALIGN;
+                __pci_read_base(dev, pci_bar_mem32, res, rom);
         }
 }
 
@@ -1053,7 +1057,8 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
                 }
         }
 
-        if (bus->self)
+        /* only one slot has pcie device */
+        if (bus->self && nr)
                 pcie_aspm_init_link_state(bus->self);
 
         return nr;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 12d489395fad..0fb365074288 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -923,6 +923,19 @@ static void __init quirk_ide_samemode(struct pci_dev *pdev)
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, quirk_ide_samemode);
 
+/*
+ * Some ATA devices break if put into D3
+ */
+
+static void __devinit quirk_no_ata_d3(struct pci_dev *pdev)
+{
+        /* Quirk the legacy ATA devices only. The AHCI ones are ok */
+        if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
+                pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_ANY_ID, quirk_no_ata_d3);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, PCI_ANY_ID, quirk_no_ata_d3);
+
 /* This was originally an Alpha specific thing, but it really fits here.
  * The i82375 PCI/EISA bridge appears as non-classified. Fix that.
  */
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 420a77540f41..8c21446996f2 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -149,10 +149,10 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t *stat
                  */
                 if (skt->irq_state != 1 && state->io_irq) {
                         skt->irq_state = 1;
-                        set_irq_type(skt->irq, IRQT_FALLING);
+                        set_irq_type(skt->irq, IRQ_TYPE_EDGE_FALLING);
                 } else if (skt->irq_state == 1 && state->io_irq == 0) {
                         skt->irq_state = 0;
-                        set_irq_type(skt->irq, IRQT_NOEDGE);
+                        set_irq_type(skt->irq, IRQ_TYPE_NONE);
                 }
 
                 skt->cs_state = *state;
@@ -527,7 +527,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
                                   IRQF_DISABLED, irqs[i].str, skt);
                 if (res)
                         break;
-                set_irq_type(irqs[i].irq, IRQT_NOEDGE);
+                set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
         }
 
         if (res) {
@@ -560,7 +560,7 @@ void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt,
 
         for (i = 0; i < nr; i++)
                 if (irqs[i].sock == skt->nr)
-                        set_irq_type(irqs[i].irq, IRQT_NOEDGE);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
 }
 EXPORT_SYMBOL(soc_pcmcia_disable_irqs);
 
@@ -571,8 +571,8 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt,
 
         for (i = 0; i < nr; i++)
                 if (irqs[i].sock == skt->nr) {
-                        set_irq_type(irqs[i].irq, IRQT_RISING);
-                        set_irq_type(irqs[i].irq, IRQT_BOTHEDGE);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
                 }
 }
 EXPORT_SYMBOL(soc_pcmcia_enable_irqs);
diff --git a/drivers/s390/kvm/Makefile b/drivers/s390/kvm/Makefile
index 4a5ec39f9ca6..0815690ac1e0 100644
--- a/drivers/s390/kvm/Makefile
+++ b/drivers/s390/kvm/Makefile
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License (version 2 only)
 # as published by the Free Software Foundation.
 
-obj-$(CONFIG_VIRTIO) += kvm_virtio.o
+obj-$(CONFIG_S390_GUEST) += kvm_virtio.o
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 7045511f9ad2..b92c19bb6876 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -4,7 +4,7 @@
    Written By: Adam Radford <linuxraid@amcc.com>
    Modifications By: Tom Couch <linuxraid@amcc.com>
 
-   Copyright (C) 2004-2007 Applied Micro Circuits Corporation.
+   Copyright (C) 2004-2008 Applied Micro Circuits Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -71,6 +71,10 @@
                  Add support for 9650SE controllers.
    2.26.02.009 - Fix dma mask setting to fallback to 32-bit if 64-bit fails.
    2.26.02.010 - Add support for 9690SA controllers.
+   2.26.02.011 - Increase max AENs drained to 256.
+                 Add MSI support and "use_msi" module parameter.
+                 Fix bug in twa_get_param() on 4GB+.
+                 Use pci_resource_len() for ioremap().
 */
 
 #include <linux/module.h>
@@ -95,7 +99,7 @@
 #include "3w-9xxx.h"
 
 /* Globals */
-#define TW_DRIVER_VERSION "2.26.02.010"
+#define TW_DRIVER_VERSION "2.26.02.011"
 static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
 static unsigned int twa_device_extension_count;
 static int twa_major = -1;
@@ -107,6 +111,10 @@ MODULE_DESCRIPTION ("3ware 9000 Storage Controller Linux Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(TW_DRIVER_VERSION);
 
+static int use_msi = 0;
+module_param(use_msi, int, S_IRUGO);
+MODULE_PARM_DESC(use_msi, "Use Message Signaled Interrupts.  Default: 0");
+
 /* Function prototypes */
 static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header);
 static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id);
@@ -1038,7 +1046,6 @@ static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int tabl
         TW_Command_Full *full_command_packet;
         TW_Command *command_packet;
         TW_Param_Apache *param;
-        unsigned long param_value;
         void *retval = NULL;
 
         /* Setup the command packet */
@@ -1057,9 +1064,8 @@ static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int tabl
         param->table_id = cpu_to_le16(table_id | 0x8000);
         param->parameter_id = cpu_to_le16(parameter_id);
         param->parameter_size_bytes = cpu_to_le16(parameter_size_bytes);
-        param_value = tw_dev->generic_buffer_phys[request_id];
 
-        command_packet->byte8_offset.param.sgl[0].address = TW_CPU_TO_SGL(param_value);
+        command_packet->byte8_offset.param.sgl[0].address = TW_CPU_TO_SGL(tw_dev->generic_buffer_phys[request_id]);
         command_packet->byte8_offset.param.sgl[0].length = cpu_to_le32(TW_SECTOR_SIZE);
 
         /* Post the command packet to the board */
@@ -2000,7 +2006,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
 {
         struct Scsi_Host *host = NULL;
         TW_Device_Extension *tw_dev;
-        u32 mem_addr;
+        unsigned long mem_addr, mem_len;
         int retval = -ENODEV;
 
         retval = pci_enable_device(pdev);
@@ -2045,13 +2051,16 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
                 goto out_free_device_extension;
         }
 
-        if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
+        if (pdev->device == PCI_DEVICE_ID_3WARE_9000) {
                 mem_addr = pci_resource_start(pdev, 1);
-        else
+                mem_len = pci_resource_len(pdev, 1);
+        } else {
                 mem_addr = pci_resource_start(pdev, 2);
+                mem_len = pci_resource_len(pdev, 2);
+        }
 
         /* Save base address */
-        tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
+        tw_dev->base_addr = ioremap(mem_addr, mem_len);
         if (!tw_dev->base_addr) {
                 TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
                 goto out_release_mem_region;
@@ -2086,7 +2095,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
 
         pci_set_drvdata(pdev, host);
 
-        printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
+        printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
                host->host_no, mem_addr, pdev->irq);
         printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
                host->host_no,
@@ -2097,6 +2106,11 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
                le32_to_cpu(*(int *)twa_get_param(tw_dev, 2, TW_INFORMATION_TABLE,
                                      TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH)));
 
+        /* Try to enable MSI */
+        if (use_msi && (pdev->device != PCI_DEVICE_ID_3WARE_9000) &&
+            !pci_enable_msi(pdev))
+                set_bit(TW_USING_MSI, &tw_dev->flags);
+
         /* Now setup the interrupt handler */
         retval = request_irq(pdev->irq, twa_interrupt, IRQF_SHARED, "3w-9xxx", tw_dev);
         if (retval) {
@@ -2120,6 +2134,8 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
         return 0;
 
 out_remove_host:
+        if (test_bit(TW_USING_MSI, &tw_dev->flags))
+                pci_disable_msi(pdev);
         scsi_remove_host(host);
 out_iounmap:
         iounmap(tw_dev->base_addr);
@@ -2151,6 +2167,10 @@ static void twa_remove(struct pci_dev *pdev)
         /* Shutdown the card */
         __twa_shutdown(tw_dev);
 
+        /* Disable MSI if enabled */
+        if (test_bit(TW_USING_MSI, &tw_dev->flags))
+                pci_disable_msi(pdev);
+
         /* Free IO remapping */
         iounmap(tw_dev->base_addr);
 
diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index d14a9479e389..1729a8785fea 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -4,7 +4,7 @@
    Written By: Adam Radford <linuxraid@amcc.com>
    Modifications By: Tom Couch <linuxraid@amcc.com>
 
-   Copyright (C) 2004-2007 Applied Micro Circuits Corporation.
+   Copyright (C) 2004-2008 Applied Micro Circuits Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -319,8 +319,8 @@ static twa_message_type twa_error_table[] = {
 
 /* Compatibility defines */
 #define TW_9000_ARCH_ID 0x5
-#define TW_CURRENT_DRIVER_SRL 30
-#define TW_CURRENT_DRIVER_BUILD 80
+#define TW_CURRENT_DRIVER_SRL 35
+#define TW_CURRENT_DRIVER_BUILD 0
 #define TW_CURRENT_DRIVER_BRANCH 0
 
 /* Phase defines */
@@ -352,8 +352,9 @@ static twa_message_type twa_error_table[] = {
 #define TW_MAX_RESET_TRIES                    2
 #define TW_MAX_CMDS_PER_LUN                   254
 #define TW_MAX_RESPONSE_DRAIN                 256
-#define TW_MAX_AEN_DRAIN                      40
+#define TW_MAX_AEN_DRAIN                      255
 #define TW_IN_RESET                           2
+#define TW_USING_MSI                          3
 #define TW_IN_ATTENTION_LOOP                  4
 #define TW_MAX_SECTORS                        256
 #define TW_AEN_WAIT_TIME                      1000
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 26be540d1dd3..c7f06298bd3c 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -63,6 +63,7 @@ comment "SCSI support type (disk, tape, CD-ROM)"
 config BLK_DEV_SD
         tristate "SCSI disk support"
         depends on SCSI
+        select CRC_T10DIF
         ---help---
           If you want to use SCSI hard disks, Fibre Channel disks,
           Serial ATA (SATA) or Parallel ATA (PATA) hard disks,
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index a8149677de23..72fd5043cfa1 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -151,6 +151,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o
 scsi_tgt-y                      += scsi_tgt_lib.o scsi_tgt_if.o
 
 sd_mod-objs     := sd.o
+sd_mod-$(CONFIG_BLK_DEV_INTEGRITY) += sd_dif.o
+
 sr_mod-objs     := sr.o sr_ioctl.o sr_vendor.o
 ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
                 := -DCONFIG_NCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 8591585e5cc5..218777bfc143 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -2278,7 +2278,7 @@ do { \
 #define ASC_DBG(lvl, format, arg...) {                                  \
         if (asc_dbglvl >= (lvl))                                        \
                 printk(KERN_DEBUG "%s: %s: " format, DRV_NAME,          \
-                        __FUNCTION__ , ## arg);                         \
+                        __func__ , ## arg);                             \
 }
 
 #define ASC_DBG_PRT_SCSI_HOST(lvl, s) \
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 0899cb61e3dd..b5a868d85eb4 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -288,20 +288,20 @@ static LIST_HEAD(aha152x_host_list);
 #define DO_LOCK(flags)  \
         do { \
                 if(spin_is_locked(&QLOCK)) { \
-                        DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \
+                        DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
                 } \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \
+                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
                 spin_lock_irqsave(&QLOCK,flags); \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \
-                QLOCKER=__FUNCTION__; \
+                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
+                QLOCKER=__func__; \
                 QLOCKERL=__LINE__; \
         } while(0)
 
 #define DO_UNLOCK(flags)        \
         do { \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \
+                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
                 spin_unlock_irqrestore(&QLOCK,flags); \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \
+                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
                 QLOCKER="(not locked)"; \
                 QLOCKERL=0; \
         } while(0)
diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
index 2ef459e9cda1..2863a9d22851 100644
--- a/drivers/scsi/aic94xx/aic94xx.h
+++ b/drivers/scsi/aic94xx/aic94xx.h
@@ -39,9 +39,9 @@
 
 #ifdef ASD_ENTER_EXIT
 #define ENTER  printk(KERN_NOTICE "%s: ENTER %s\n", ASD_DRIVER_NAME, \
-                __FUNCTION__)
+                __func__)
 #define EXIT   printk(KERN_NOTICE "%s: --EXIT %s\n", ASD_DRIVER_NAME, \
-                __FUNCTION__)
+                __func__)
 #else
 #define ENTER
 #define EXIT
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
index 83a78222896d..eb9dc3195fdf 100644
--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -1359,7 +1359,7 @@ int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask)
         struct asd_ascb *ascb_list;
 
         if (!phy_mask) {
-                asd_printk("%s called with phy_mask of 0!?\n", __FUNCTION__);
+                asd_printk("%s called with phy_mask of 0!?\n", __func__);
                 return 0;
         }
 
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 46643319c520..ca55013b6ae5 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -211,7 +211,7 @@ static void asd_form_port(struct asd_ha_struct *asd_ha, struct asd_phy *phy)
                 phy->asd_port = port;
         }
         ASD_DPRINTK("%s: updating phy_mask 0x%x for phy%d\n",
-                    __FUNCTION__, phy->asd_port->phy_mask, sas_phy->id);
+                    __func__, phy->asd_port->phy_mask, sas_phy->id);
         asd_update_port_links(asd_ha, phy);
         spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags);
 }
@@ -294,7 +294,7 @@ static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
                 struct asd_ascb *cp = asd_ascb_alloc_list(ascb->ha, &num,
                                                           GFP_ATOMIC);
                 if (!cp) {
-                        asd_printk("%s: out of memory\n", __FUNCTION__);
+                        asd_printk("%s: out of memory\n", __func__);
                         goto out;
                 }
                 ASD_DPRINTK("phy%d: retries:0 performing link reset seq\n",
@@ -446,7 +446,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 struct domain_device *failed_dev = NULL;
 
                 ASD_DPRINTK("%s: REQ_TASK_ABORT, reason=0x%X\n",
-                            __FUNCTION__, dl->status_block[3]);
+                            __func__, dl->status_block[3]);
 
                 /*
                  * Find the task that caused the abort and abort it first.
@@ -474,7 +474,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
 
                 if (!failed_dev) {
                         ASD_DPRINTK("%s: Can't find task (tc=%d) to abort!\n",
-                                    __FUNCTION__, tc_abort);
+                                    __func__, tc_abort);
                         goto out;
                 }
 
@@ -502,7 +502,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 conn_handle = *((u16*)(&dl->status_block[1]));
                 conn_handle = le16_to_cpu(conn_handle);
 
-                ASD_DPRINTK("%s: REQ_DEVICE_RESET, reason=0x%X\n", __FUNCTION__,
+                ASD_DPRINTK("%s: REQ_DEVICE_RESET, reason=0x%X\n", __func__,
                             dl->status_block[3]);
 
                 /* Find the last pending task for the device... */
@@ -522,7 +522,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
 
                 if (!last_dev_task) {
                         ASD_DPRINTK("%s: Device reset for idle device %d?\n",
-                                    __FUNCTION__, conn_handle);
+                                    __func__, conn_handle);
                         goto out;
                 }
 
@@ -549,10 +549,10 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 goto out;
         }
         case SIGNAL_NCQ_ERROR:
-                ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __FUNCTION__);
+                ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __func__);
                 goto out;
         case CLEAR_NCQ_ERROR:
-                ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __FUNCTION__);
+                ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __func__);
                 goto out;
         }
 
@@ -560,26 +560,26 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
 
         switch (sb_opcode) {
         case BYTES_DMAED:
-                ASD_DPRINTK("%s: phy%d: BYTES_DMAED\n", __FUNCTION__, phy_id);
+                ASD_DPRINTK("%s: phy%d: BYTES_DMAED\n", __func__, phy_id);
                 asd_bytes_dmaed_tasklet(ascb, dl, edb, phy_id);
                 break;
         case PRIMITIVE_RECVD:
-                ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __FUNCTION__,
+                ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __func__,
                             phy_id);
                 asd_primitive_rcvd_tasklet(ascb, dl, phy_id);
                 break;
         case PHY_EVENT:
-                ASD_DPRINTK("%s: phy%d: PHY_EVENT\n", __FUNCTION__, phy_id);
+                ASD_DPRINTK("%s: phy%d: PHY_EVENT\n", __func__, phy_id);
                 asd_phy_event_tasklet(ascb, dl);
                 break;
         case LINK_RESET_ERROR:
-                ASD_DPRINTK("%s: phy%d: LINK_RESET_ERROR\n", __FUNCTION__,
+                ASD_DPRINTK("%s: phy%d: LINK_RESET_ERROR\n", __func__,
                             phy_id);
                 asd_link_reset_err_tasklet(ascb, dl, phy_id);
                 break;
         case TIMER_EVENT:
                 ASD_DPRINTK("%s: phy%d: TIMER_EVENT, lost dw sync\n",
-                            __FUNCTION__, phy_id);
+                            __func__, phy_id);
                 asd_turn_led(asd_ha, phy_id, 0);
                 /* the device is gone */
                 sas_phy_disconnected(sas_phy);
@@ -587,7 +587,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
                 break;
         default:
-                ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __FUNCTION__,
+                ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __func__,
                             phy_id, sb_opcode);
                 ASD_DPRINTK("edb is 0x%x! dl->opcode is 0x%x\n",
                             edb, dl->opcode);
@@ -654,7 +654,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
 
         if (status != 0) {
                 ASD_DPRINTK("%s: phy%d status block opcode:0x%x\n",
-                            __FUNCTION__, phy_id, status);
+                            __func__, phy_id, status);
                 goto out;
         }
 
@@ -663,7 +663,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
                 asd_ha->hw_prof.enabled_phys &= ~(1 << phy_id);
                 asd_turn_led(asd_ha, phy_id, 0);
                 asd_control_led(asd_ha, phy_id, 0);
-                ASD_DPRINTK("%s: disable phy%d\n", __FUNCTION__, phy_id);
+                ASD_DPRINTK("%s: disable phy%d\n", __func__, phy_id);
                 break;
 
         case ENABLE_PHY:
@@ -673,40 +673,40 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
                         get_lrate_mode(phy, oob_mode);
                         asd_turn_led(asd_ha, phy_id, 1);
                         ASD_DPRINTK("%s: phy%d, lrate:0x%x, proto:0x%x\n",
-                                    __FUNCTION__, phy_id,phy->sas_phy.linkrate,
+                                    __func__, phy_id,phy->sas_phy.linkrate,
                                     phy->sas_phy.iproto);
                 } else if (oob_status & CURRENT_SPINUP_HOLD) {
                         asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
                         asd_turn_led(asd_ha, phy_id, 1);
-                        ASD_DPRINTK("%s: phy%d, spinup hold\n", __FUNCTION__,
+                        ASD_DPRINTK("%s: phy%d, spinup hold\n", __func__,
                                     phy_id);
                 } else if (oob_status & CURRENT_ERR_MASK) {
                         asd_turn_led(asd_ha, phy_id, 0);
                         ASD_DPRINTK("%s: phy%d: error: oob status:0x%02x\n",
-                                    __FUNCTION__, phy_id, oob_status);
+                                    __func__, phy_id, oob_status);
                 } else if (oob_status & (CURRENT_HOT_PLUG_CNCT
                                          | CURRENT_DEVICE_PRESENT))  {
                         asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
                         asd_turn_led(asd_ha, phy_id, 1);
                         ASD_DPRINTK("%s: phy%d: hot plug or device present\n",
-                                    __FUNCTION__, phy_id);
+                                    __func__, phy_id);
                 } else {
                         asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
                         asd_turn_led(asd_ha, phy_id, 0);
                         ASD_DPRINTK("%s: phy%d: no device present: "
                                     "oob_status:0x%x\n",
-                                    __FUNCTION__, phy_id, oob_status);
+                                    __func__, phy_id, oob_status);
                 }
                 break;
         case RELEASE_SPINUP_HOLD:
         case PHY_NO_OP:
         case EXECUTE_HARD_RESET:
-                ASD_DPRINTK("%s: phy%d: sub_func:0x%x\n", __FUNCTION__,
+                ASD_DPRINTK("%s: phy%d: sub_func:0x%x\n", __func__,
                             phy_id, control_phy->sub_func);
                 /* XXX finish */
                 break;
         default:
-                ASD_DPRINTK("%s: phy%d: sub_func:0x%x?\n", __FUNCTION__,
+                ASD_DPRINTK("%s: phy%d: sub_func:0x%x?\n", __func__,
                             phy_id, control_phy->sub_func);
                 break;
         }
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 326765c9caf8..75d20f72501f 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -320,7 +320,7 @@ Again:
         case TC_RESUME:
         case TC_PARTIAL_SG_LIST:
         default:
-                ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __FUNCTION__, opcode);
+                ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __func__, opcode);
                 break;
         }
 
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
index 633ff40c736a..d4640ef6d44f 100644
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -75,12 +75,12 @@ static void asd_clear_nexus_tasklet_complete(struct asd_ascb *ascb,
                                              struct done_list_struct *dl)
 {
         struct tasklet_completion_status *tcs = ascb->uldd_task;
-        ASD_DPRINTK("%s: here\n", __FUNCTION__);
+        ASD_DPRINTK("%s: here\n", __func__);
         if (!del_timer(&ascb->timer)) {
-                ASD_DPRINTK("%s: couldn't delete timer\n", __FUNCTION__);
+                ASD_DPRINTK("%s: couldn't delete timer\n", __func__);
                 return;
         }
-        ASD_DPRINTK("%s: opcode: 0x%x\n", __FUNCTION__, dl->opcode);
+        ASD_DPRINTK("%s: opcode: 0x%x\n", __func__, dl->opcode);
         tcs->dl_opcode = dl->opcode;
         complete(ascb->completion);
         asd_ascb_free(ascb);
@@ -91,7 +91,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
         struct asd_ascb *ascb = (void *)data;
         struct tasklet_completion_status *tcs = ascb->uldd_task;
 
-        ASD_DPRINTK("%s: here\n", __FUNCTION__);
+        ASD_DPRINTK("%s: here\n", __func__);
         tcs->dl_opcode = TMF_RESP_FUNC_FAILED;
         complete(ascb->completion);
 }
@@ -103,7 +103,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
         DECLARE_COMPLETION_ONSTACK(completion); \
         DECLARE_TCS(tcs); \
                 \
-        ASD_DPRINTK("%s: PRE\n", __FUNCTION__); \
+        ASD_DPRINTK("%s: PRE\n", __func__); \
         res = 1;                \
         ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); \
         if (!ascb)              \
@@ -115,12 +115,12 @@ static void asd_clear_nexus_timedout(unsigned long data)
         scb->header.opcode = CLEAR_NEXUS
 
 #define CLEAR_NEXUS_POST        \
-        ASD_DPRINTK("%s: POST\n", __FUNCTION__); \
+        ASD_DPRINTK("%s: POST\n", __func__); \
         res = asd_enqueue_internal(ascb, asd_clear_nexus_tasklet_complete, \
                                    asd_clear_nexus_timedout);              \
         if (res)                \
                 goto out_err;   \
-        ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __FUNCTION__); \
+        ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __func__); \
         wait_for_completion(&completion); \
         res = tcs.dl_opcode; \
         if (res == TC_NO_ERROR) \
@@ -417,7 +417,7 @@ int asd_abort_task(struct sas_task *task)
         if (task->task_state_flags & SAS_TASK_STATE_DONE) {
                 spin_unlock_irqrestore(&task->task_state_lock, flags);
                 res = TMF_RESP_FUNC_COMPLETE;
-                ASD_DPRINTK("%s: task 0x%p done\n", __FUNCTION__, task);
+                ASD_DPRINTK("%s: task 0x%p done\n", __func__, task);
                 goto out_done;
         }
         spin_unlock_irqrestore(&task->task_state_lock, flags);
@@ -481,7 +481,7 @@ int asd_abort_task(struct sas_task *task)
         if (task->task_state_flags & SAS_TASK_STATE_DONE) {
                 spin_unlock_irqrestore(&task->task_state_lock, flags);
                 res = TMF_RESP_FUNC_COMPLETE;
-                ASD_DPRINTK("%s: task 0x%p done\n", __FUNCTION__, task);
+                ASD_DPRINTK("%s: task 0x%p done\n", __func__, task);
                 goto out_done;
         }
         spin_unlock_irqrestore(&task->task_state_lock, flags);
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index a715632e19d4..477542602284 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -240,7 +240,7 @@ static void __fas216_checkmagic(FAS216_Info *info, const char *func)
                 panic("scsi memory space corrupted in %s", func);
         }
 }
-#define fas216_checkmagic(info) __fas216_checkmagic((info), __FUNCTION__)
+#define fas216_checkmagic(info) __fas216_checkmagic((info), __func__)
 #else
 #define fas216_checkmagic(info)
 #endif
@@ -2658,7 +2658,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
         fas216_checkmagic(info);
 
         printk("scsi%d.%c: %s: resetting host\n",
-                info->host->host_no, '0' + SCpnt->device->id, __FUNCTION__);
+                info->host->host_no, '0' + SCpnt->device->id, __func__);
 
         /*
          * Reset the SCSI chip.
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index aa2011b64683..3c257fe0893e 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -930,6 +930,7 @@ static int ch_probe(struct device *dev)
         if (init)
                 ch_init_elem(ch);
 
+        dev_set_drvdata(dev, ch);
         sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name);
 
         return 0;
diff --git a/drivers/scsi/device_handler/Kconfig b/drivers/scsi/device_handler/Kconfig
index 2adc0f666b68..67070257919f 100644
--- a/drivers/scsi/device_handler/Kconfig
+++ b/drivers/scsi/device_handler/Kconfig
@@ -30,3 +30,11 @@ config SCSI_DH_EMC
         depends on SCSI_DH
         help
         If you have a EMC CLARiiON select y. Otherwise, say N.
+
+config SCSI_DH_ALUA
+        tristate "SPC-3 ALUA Device Handler (EXPERIMENTAL)"
+        depends on SCSI_DH && EXPERIMENTAL
+        help
+          SCSI Device handler for generic SPC-3 Asymmetric Logical Unit
+          Access (ALUA).
+
diff --git a/drivers/scsi/device_handler/Makefile b/drivers/scsi/device_handler/Makefile
index 35272e93b1c8..e1d2ea083e15 100644
--- a/drivers/scsi/device_handler/Makefile
+++ b/drivers/scsi/device_handler/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_SCSI_DH)		+= scsi_dh.o
 obj-$(CONFIG_SCSI_DH_RDAC)      += scsi_dh_rdac.o
 obj-$(CONFIG_SCSI_DH_HP_SW)     += scsi_dh_hp_sw.o
 obj-$(CONFIG_SCSI_DH_EMC)       += scsi_dh_emc.o
+obj-$(CONFIG_SCSI_DH_ALUA)      += scsi_dh_alua.o
diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c
index ab6c21cd9689..a518f2eff19a 100644
--- a/drivers/scsi/device_handler/scsi_dh.c
+++ b/drivers/scsi/device_handler/scsi_dh.c
@@ -24,8 +24,16 @@
 #include <scsi/scsi_dh.h>
 #include "../scsi_priv.h"
 
+struct scsi_dh_devinfo_list {
+        struct list_head node;
+        char vendor[9];
+        char model[17];
+        struct scsi_device_handler *handler;
+};
+
 static DEFINE_SPINLOCK(list_lock);
 static LIST_HEAD(scsi_dh_list);
+static LIST_HEAD(scsi_dh_dev_list);
 
 static struct scsi_device_handler *get_device_handler(const char *name)
 {
@@ -33,7 +41,7 @@ static struct scsi_device_handler *get_device_handler(const char *name)
 
         spin_lock(&list_lock);
         list_for_each_entry(tmp, &scsi_dh_list, list) {
-                if (!strcmp(tmp->name, name)) {
+                if (!strncmp(tmp->name, name, strlen(tmp->name))) {
                         found = tmp;
                         break;
                 }
@@ -42,11 +50,307 @@ static struct scsi_device_handler *get_device_handler(const char *name)
         return found;
 }
 
+
+static struct scsi_device_handler *
+scsi_dh_cache_lookup(struct scsi_device *sdev)
+{
+        struct scsi_dh_devinfo_list *tmp;
+        struct scsi_device_handler *found_dh = NULL;
+
+        spin_lock(&list_lock);
+        list_for_each_entry(tmp, &scsi_dh_dev_list, node) {
+                if (!strncmp(sdev->vendor, tmp->vendor, strlen(tmp->vendor)) &&
+                    !strncmp(sdev->model, tmp->model, strlen(tmp->model))) {
+                        found_dh = tmp->handler;
+                        break;
+                }
+        }
+        spin_unlock(&list_lock);
+
+        return found_dh;
+}
+
+static int scsi_dh_handler_lookup(struct scsi_device_handler *scsi_dh,
+                                  struct scsi_device *sdev)
+{
+        int i, found = 0;
+
+        for(i = 0; scsi_dh->devlist[i].vendor; i++) {
+                if (!strncmp(sdev->vendor, scsi_dh->devlist[i].vendor,
+                             strlen(scsi_dh->devlist[i].vendor)) &&
+                    !strncmp(sdev->model, scsi_dh->devlist[i].model,
+                             strlen(scsi_dh->devlist[i].model))) {
+                        found = 1;
+                        break;
+                }
+        }
+        return found;
+}
+
+/*
+ * device_handler_match - Attach a device handler to a device
+ * @scsi_dh - The device handler to match against or NULL
+ * @sdev - SCSI device to be tested against @scsi_dh
+ *
+ * Tests @sdev against the device handler @scsi_dh or against
+ * all registered device_handler if @scsi_dh == NULL.
+ * Returns the found device handler or NULL if not found.
+ */
+static struct scsi_device_handler *
+device_handler_match(struct scsi_device_handler *scsi_dh,
+                     struct scsi_device *sdev)
+{
+        struct scsi_device_handler *found_dh = NULL;
+        struct scsi_dh_devinfo_list *tmp;
+
+        found_dh = scsi_dh_cache_lookup(sdev);
+        if (found_dh)
+                return found_dh;
+
+        if (scsi_dh) {
+                if (scsi_dh_handler_lookup(scsi_dh, sdev))
+                        found_dh = scsi_dh;
+        } else {
+                struct scsi_device_handler *tmp_dh;
+
+                spin_lock(&list_lock);
+                list_for_each_entry(tmp_dh, &scsi_dh_list, list) {
+                        if (scsi_dh_handler_lookup(tmp_dh, sdev))
+                                found_dh = tmp_dh;
+                }
+                spin_unlock(&list_lock);
+        }
+
+        if (found_dh) { /* If device is found, add it to the cache */
+                tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
+                if (tmp) {
+                        strncpy(tmp->vendor, sdev->vendor, 8);
+                        strncpy(tmp->model, sdev->model, 16);
+                        tmp->vendor[8] = '\0';
+                        tmp->model[16] = '\0';
+                        tmp->handler = found_dh;
+                        spin_lock(&list_lock);
+                        list_add(&tmp->node, &scsi_dh_dev_list);
+                        spin_unlock(&list_lock);
+                } else {
+                        found_dh = NULL;
+                }
+        }
+
+        return found_dh;
+}
+
+/*
+ * scsi_dh_handler_attach - Attach a device handler to a device
+ * @sdev - SCSI device the device handler should attach to
+ * @scsi_dh - The device handler to attach
+ */
+static int scsi_dh_handler_attach(struct scsi_device *sdev,
+                                  struct scsi_device_handler *scsi_dh)
+{
+        int err = 0;
+
+        if (sdev->scsi_dh_data) {
+                if (sdev->scsi_dh_data->scsi_dh != scsi_dh)
+                        err = -EBUSY;
+        } else if (scsi_dh->attach)
+                err = scsi_dh->attach(sdev);
+
+        return err;
+}
+
+/*
+ * scsi_dh_handler_detach - Detach a device handler from a device
+ * @sdev - SCSI device the device handler should be detached from
+ * @scsi_dh - Device handler to be detached
+ *
+ * Detach from a device handler. If a device handler is specified,
+ * only detach if the currently attached handler matches @scsi_dh.
+ */
+static void scsi_dh_handler_detach(struct scsi_device *sdev,
+                                   struct scsi_device_handler *scsi_dh)
+{
+        if (!sdev->scsi_dh_data)
+                return;
+
+        if (scsi_dh && scsi_dh != sdev->scsi_dh_data->scsi_dh)
+                return;
+
+        if (!scsi_dh)
+                scsi_dh = sdev->scsi_dh_data->scsi_dh;
+
+        if (scsi_dh && scsi_dh->detach)
+                scsi_dh->detach(sdev);
+}
+
+/*
+ * Functions for sysfs attribute 'dh_state'
+ */
+static ssize_t
+store_dh_state(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct scsi_device_handler *scsi_dh;
+        int err = -EINVAL;
+
+        if (!sdev->scsi_dh_data) {
+                /*
+                 * Attach to a device handler
+                 */
+                if (!(scsi_dh = get_device_handler(buf)))
+                        return err;
+                err = scsi_dh_handler_attach(sdev, scsi_dh);
+        } else {
+                scsi_dh = sdev->scsi_dh_data->scsi_dh;
+                if (!strncmp(buf, "detach", 6)) {
+                        /*
+                         * Detach from a device handler
+                         */
+                        scsi_dh_handler_detach(sdev, scsi_dh);
+                        err = 0;
+                } else if (!strncmp(buf, "activate", 8)) {
+                        /*
+                         * Activate a device handler
+                         */
+                        if (scsi_dh->activate)
+                                err = scsi_dh->activate(sdev);
+                        else
+                                err = 0;
+                }
+        }
+
+        return err<0?err:count;
+}
+
+static ssize_t
+show_dh_state(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+
+        if (!sdev->scsi_dh_data)
+                return snprintf(buf, 20, "detached\n");
+
+        return snprintf(buf, 20, "%s\n", sdev->scsi_dh_data->scsi_dh->name);
+}
+
+static struct device_attribute scsi_dh_state_attr =
+        __ATTR(dh_state, S_IRUGO | S_IWUSR, show_dh_state,
+               store_dh_state);
+
+/*
+ * scsi_dh_sysfs_attr_add - Callback for scsi_init_dh
+ */
+static int scsi_dh_sysfs_attr_add(struct device *dev, void *data)
+{
+        struct scsi_device *sdev;
+        int err;
+
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
+        err = device_create_file(&sdev->sdev_gendev,
+                                 &scsi_dh_state_attr);
+
+        return 0;
+}
+
+/*
+ * scsi_dh_sysfs_attr_remove - Callback for scsi_exit_dh
+ */
+static int scsi_dh_sysfs_attr_remove(struct device *dev, void *data)
+{
+        struct scsi_device *sdev;
+
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
+        device_remove_file(&sdev->sdev_gendev,
+                           &scsi_dh_state_attr);
+
+        return 0;
+}
+
+/*
+ * scsi_dh_notifier - notifier chain callback
+ */
+static int scsi_dh_notifier(struct notifier_block *nb,
+                            unsigned long action, void *data)
+{
+        struct device *dev = data;
+        struct scsi_device *sdev;
+        int err = 0;
+        struct scsi_device_handler *devinfo = NULL;
+
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
+        if (action == BUS_NOTIFY_ADD_DEVICE) {
+                devinfo = device_handler_match(NULL, sdev);
+                if (!devinfo)
+                        goto out;
+
+                err = scsi_dh_handler_attach(sdev, devinfo);
+                if (!err)
+                        err = device_create_file(dev, &scsi_dh_state_attr);
+        } else if (action == BUS_NOTIFY_DEL_DEVICE) {
+                device_remove_file(dev, &scsi_dh_state_attr);
+                scsi_dh_handler_detach(sdev, NULL);
+        }
+out:
+        return err;
+}
+
+/*
+ * scsi_dh_notifier_add - Callback for scsi_register_device_handler
+ */
 static int scsi_dh_notifier_add(struct device *dev, void *data)
 {
         struct scsi_device_handler *scsi_dh = data;
+        struct scsi_device *sdev;
+
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        if (!get_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
+        if (device_handler_match(scsi_dh, sdev))
+                scsi_dh_handler_attach(sdev, scsi_dh);
+
+        put_device(dev);
+
+        return 0;
+}
+
+/*
+ * scsi_dh_notifier_remove - Callback for scsi_unregister_device_handler
+ */
+static int scsi_dh_notifier_remove(struct device *dev, void *data)
+{
+        struct scsi_device_handler *scsi_dh = data;
+        struct scsi_device *sdev;
+
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        if (!get_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
+        scsi_dh_handler_detach(sdev, scsi_dh);
+
+        put_device(dev);
 
-        scsi_dh->nb.notifier_call(&scsi_dh->nb, BUS_NOTIFY_ADD_DEVICE, dev);
         return 0;
 }
 
@@ -59,33 +363,19 @@ static int scsi_dh_notifier_add(struct device *dev, void *data)
  */
 int scsi_register_device_handler(struct scsi_device_handler *scsi_dh)
 {
-        int ret = -EBUSY;
-        struct scsi_device_handler *tmp;
+        if (get_device_handler(scsi_dh->name))
+                return -EBUSY;
 
-        tmp = get_device_handler(scsi_dh->name);
-        if (tmp)
-                goto done;
-
-        ret = bus_register_notifier(&scsi_bus_type, &scsi_dh->nb);
-
-        bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh, scsi_dh_notifier_add);
         spin_lock(&list_lock);
         list_add(&scsi_dh->list, &scsi_dh_list);
         spin_unlock(&list_lock);
+        bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh, scsi_dh_notifier_add);
+        printk(KERN_INFO "%s: device handler registered\n", scsi_dh->name);
 
-done:
-        return ret;
+        return SCSI_DH_OK;
 }
 EXPORT_SYMBOL_GPL(scsi_register_device_handler);
 
-static int scsi_dh_notifier_remove(struct device *dev, void *data)
-{
-        struct scsi_device_handler *scsi_dh = data;
-
-        scsi_dh->nb.notifier_call(&scsi_dh->nb, BUS_NOTIFY_DEL_DEVICE, dev);
-        return 0;
-}
-
 /*
  * scsi_unregister_device_handler - register a device handler personality
  *      module.
@@ -95,23 +385,26 @@ static int scsi_dh_notifier_remove(struct device *dev, void *data)
  */
 int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)
 {
-        int ret = -ENODEV;
-        struct scsi_device_handler *tmp;
-
-        tmp = get_device_handler(scsi_dh->name);
-        if (!tmp)
-                goto done;
+        struct scsi_dh_devinfo_list *tmp, *pos;
 
-        ret = bus_unregister_notifier(&scsi_bus_type, &scsi_dh->nb);
+        if (!get_device_handler(scsi_dh->name))
+                return -ENODEV;
 
         bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh,
-                                        scsi_dh_notifier_remove);
+                         scsi_dh_notifier_remove);
+
         spin_lock(&list_lock);
         list_del(&scsi_dh->list);
+        list_for_each_entry_safe(pos, tmp, &scsi_dh_dev_list, node) {
+                if (pos->handler == scsi_dh) {
+                        list_del(&pos->node);
+                        kfree(pos);
+                }
+        }
         spin_unlock(&list_lock);
+        printk(KERN_INFO "%s: device handler unregistered\n", scsi_dh->name);
 
-done:
-        return ret;
+        return SCSI_DH_OK;
 }
 EXPORT_SYMBOL_GPL(scsi_unregister_device_handler);
 
@@ -157,6 +450,97 @@ int scsi_dh_handler_exist(const char *name)
 }
 EXPORT_SYMBOL_GPL(scsi_dh_handler_exist);
 
+/*
+ * scsi_dh_handler_attach - Attach device handler
+ * @sdev - sdev the handler should be attached to
+ * @name - name of the handler to attach
+ */
+int scsi_dh_attach(struct request_queue *q, const char *name)
+{
+        unsigned long flags;
+        struct scsi_device *sdev;
+        struct scsi_device_handler *scsi_dh;
+        int err = 0;
+
+        scsi_dh = get_device_handler(name);
+        if (!scsi_dh)
+                return -EINVAL;
+
+        spin_lock_irqsave(q->queue_lock, flags);
+        sdev = q->queuedata;
+        if (!sdev || !get_device(&sdev->sdev_gendev))
+                err = -ENODEV;
+        spin_unlock_irqrestore(q->queue_lock, flags);
+
+        if (!err) {
+                err = scsi_dh_handler_attach(sdev, scsi_dh);
+
+                put_device(&sdev->sdev_gendev);
+        }
+        return err;
+}
+EXPORT_SYMBOL_GPL(scsi_dh_attach);
+
+/*
+ * scsi_dh_handler_detach - Detach device handler
+ * @sdev - sdev the handler should be detached from
+ *
+ * This function will detach the device handler only
+ * if the sdev is not part of the internal list, ie
+ * if it has been attached manually.
+ */
+void scsi_dh_detach(struct request_queue *q)
+{
+        unsigned long flags;
+        struct scsi_device *sdev;
+        struct scsi_device_handler *scsi_dh = NULL;
+
+        spin_lock_irqsave(q->queue_lock, flags);
+        sdev = q->queuedata;
+        if (!sdev || !get_device(&sdev->sdev_gendev))
+                sdev = NULL;
+        spin_unlock_irqrestore(q->queue_lock, flags);
+
+        if (!sdev)
+                return;
+
+        if (sdev->scsi_dh_data) {
+                /* if sdev is not on internal list, detach */
+                scsi_dh = sdev->scsi_dh_data->scsi_dh;
+                if (!device_handler_match(scsi_dh, sdev))
+                        scsi_dh_handler_detach(sdev, scsi_dh);
+        }
+        put_device(&sdev->sdev_gendev);
+}
+EXPORT_SYMBOL_GPL(scsi_dh_detach);
+
+static struct notifier_block scsi_dh_nb = {
+        .notifier_call = scsi_dh_notifier
+};
+
+static int __init scsi_dh_init(void)
+{
+        int r;
+
+        r = bus_register_notifier(&scsi_bus_type, &scsi_dh_nb);
+
+        if (!r)
+                bus_for_each_dev(&scsi_bus_type, NULL, NULL,
+                                 scsi_dh_sysfs_attr_add);
+
+        return r;
+}
+
+static void __exit scsi_dh_exit(void)
+{
+        bus_for_each_dev(&scsi_bus_type, NULL, NULL,
+                         scsi_dh_sysfs_attr_remove);
+        bus_unregister_notifier(&scsi_bus_type, &scsi_dh_nb);
+}
+
+module_init(scsi_dh_init);
+module_exit(scsi_dh_exit);
+
 MODULE_DESCRIPTION("SCSI device handler");
 MODULE_AUTHOR("Chandra Seetharaman <sekharan@us.ibm.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
new file mode 100644
index 000000000000..fcdd73f25625
--- /dev/null
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -0,0 +1,802 @@
+/*
+ * Generic SCSI-3 ALUA SCSI Device Handler
+ *
+ * Copyright (C) 2007, 2008 Hannes Reinecke, SUSE Linux Products GmbH.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+#include <scsi/scsi.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_dh.h>
+
+#define ALUA_DH_NAME "alua"
+#define ALUA_DH_VER "1.2"
+
+#define TPGS_STATE_OPTIMIZED            0x0
+#define TPGS_STATE_NONOPTIMIZED         0x1
+#define TPGS_STATE_STANDBY              0x2
+#define TPGS_STATE_UNAVAILABLE          0x3
+#define TPGS_STATE_OFFLINE              0xe
+#define TPGS_STATE_TRANSITIONING        0xf
+
+#define TPGS_SUPPORT_NONE               0x00
+#define TPGS_SUPPORT_OPTIMIZED          0x01
+#define TPGS_SUPPORT_NONOPTIMIZED       0x02
+#define TPGS_SUPPORT_STANDBY            0x04
+#define TPGS_SUPPORT_UNAVAILABLE        0x08
+#define TPGS_SUPPORT_OFFLINE            0x40
+#define TPGS_SUPPORT_TRANSITION         0x80
+
+#define TPGS_MODE_UNINITIALIZED          -1
+#define TPGS_MODE_NONE                  0x0
+#define TPGS_MODE_IMPLICIT              0x1
+#define TPGS_MODE_EXPLICIT              0x2
+
+#define ALUA_INQUIRY_SIZE               36
+#define ALUA_FAILOVER_TIMEOUT           (60 * HZ)
+#define ALUA_FAILOVER_RETRIES           5
+
+struct alua_dh_data {
+        int                     group_id;
+        int                     rel_port;
+        int                     tpgs;
+        int                     state;
+        unsigned char           inq[ALUA_INQUIRY_SIZE];
+        unsigned char           *buff;
+        int                     bufflen;
+        unsigned char           sense[SCSI_SENSE_BUFFERSIZE];
+        int                     senselen;
+};
+
+#define ALUA_POLICY_SWITCH_CURRENT      0
+#define ALUA_POLICY_SWITCH_ALL          1
+
+static inline struct alua_dh_data *get_alua_data(struct scsi_device *sdev)
+{
+        struct scsi_dh_data *scsi_dh_data = sdev->scsi_dh_data;
+        BUG_ON(scsi_dh_data == NULL);
+        return ((struct alua_dh_data *) scsi_dh_data->buf);
+}
+
+static int realloc_buffer(struct alua_dh_data *h, unsigned len)
+{
+        if (h->buff && h->buff != h->inq)
+                kfree(h->buff);
+
+        h->buff = kmalloc(len, GFP_NOIO);
+        if (!h->buff) {
+                h->buff = h->inq;
+                h->bufflen = ALUA_INQUIRY_SIZE;
+                return 1;
+        }
+        h->bufflen = len;
+        return 0;
+}
+
+static struct request *get_alua_req(struct scsi_device *sdev,
+                                    void *buffer, unsigned buflen, int rw)
+{
+        struct request *rq;
+        struct request_queue *q = sdev->request_queue;
+
+        rq = blk_get_request(q, rw, GFP_NOIO);
+
+        if (!rq) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: blk_get_request failed\n", __func__);
+                return NULL;
+        }
+
+        if (buflen && blk_rq_map_kern(q, rq, buffer, buflen, GFP_NOIO)) {
+                blk_put_request(rq);
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: blk_rq_map_kern failed\n", __func__);
+                return NULL;
+        }
+
+        rq->cmd_type = REQ_TYPE_BLOCK_PC;
+        rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
+        rq->retries = ALUA_FAILOVER_RETRIES;
+        rq->timeout = ALUA_FAILOVER_TIMEOUT;
+
+        return rq;
+}
+
+/*
+ * submit_std_inquiry - Issue a standard INQUIRY command
+ * @sdev: sdev the command should be send to
+ */
+static int submit_std_inquiry(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        struct request *rq;
+        int err = SCSI_DH_RES_TEMP_UNAVAIL;
+
+        rq = get_alua_req(sdev, h->inq, ALUA_INQUIRY_SIZE, READ);
+        if (!rq)
+                goto done;
+
+        /* Prepare the command. */
+        rq->cmd[0] = INQUIRY;
+        rq->cmd[1] = 0;
+        rq->cmd[2] = 0;
+        rq->cmd[4] = ALUA_INQUIRY_SIZE;
+        rq->cmd_len = COMMAND_SIZE(INQUIRY);
+
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = h->senselen = 0;
+
+        err = blk_execute_rq(rq->q, NULL, rq, 1);
+        if (err == -EIO) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: std inquiry failed with %x\n",
+                            ALUA_DH_NAME, rq->errors);
+                h->senselen = rq->sense_len;
+                err = SCSI_DH_IO;
+        }
+        blk_put_request(rq);
+done:
+        return err;
+}
+
+/*
+ * submit_vpd_inquiry - Issue an INQUIRY VPD page 0x83 command
+ * @sdev: sdev the command should be sent to
+ */
+static int submit_vpd_inquiry(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        struct request *rq;
+        int err = SCSI_DH_RES_TEMP_UNAVAIL;
+
+        rq = get_alua_req(sdev, h->buff, h->bufflen, READ);
+        if (!rq)
+                goto done;
+
+        /* Prepare the command. */
+        rq->cmd[0] = INQUIRY;
+        rq->cmd[1] = 1;
+        rq->cmd[2] = 0x83;
+        rq->cmd[4] = h->bufflen;
+        rq->cmd_len = COMMAND_SIZE(INQUIRY);
+
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = h->senselen = 0;
+
+        err = blk_execute_rq(rq->q, NULL, rq, 1);
+        if (err == -EIO) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: evpd inquiry failed with %x\n",
+                            ALUA_DH_NAME, rq->errors);
+                h->senselen = rq->sense_len;
+                err = SCSI_DH_IO;
+        }
+        blk_put_request(rq);
+done:
+        return err;
+}
+
+/*
+ * submit_rtpg - Issue a REPORT TARGET GROUP STATES command
+ * @sdev: sdev the command should be sent to
+ */
+static unsigned submit_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        struct request *rq;
+        int err = SCSI_DH_RES_TEMP_UNAVAIL;
+
+        rq = get_alua_req(sdev, h->buff, h->bufflen, READ);
+        if (!rq)
+                goto done;
+
+        /* Prepare the command. */
+        rq->cmd[0] = MAINTENANCE_IN;
+        rq->cmd[1] = MI_REPORT_TARGET_PGS;
+        rq->cmd[6] = (h->bufflen >> 24) & 0xff;
+        rq->cmd[7] = (h->bufflen >> 16) & 0xff;
+        rq->cmd[8] = (h->bufflen >>  8) & 0xff;
+        rq->cmd[9] = h->bufflen & 0xff;
+        rq->cmd_len = COMMAND_SIZE(MAINTENANCE_IN);
+
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = h->senselen = 0;
+
+        err = blk_execute_rq(rq->q, NULL, rq, 1);
+        if (err == -EIO) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: rtpg failed with %x\n",
+                            ALUA_DH_NAME, rq->errors);
+                h->senselen = rq->sense_len;
+                err = SCSI_DH_IO;
+        }
+        blk_put_request(rq);
+done:
+        return err;
+}
+
+/*
+ * submit_stpg - Issue a SET TARGET GROUP STATES command
+ * @sdev: sdev the command should be sent to
+ *
+ * Currently we're only setting the current target port group state
+ * to 'active/optimized' and let the array firmware figure out
+ * the states of the remaining groups.
+ */
+static unsigned submit_stpg(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        struct request *rq;
+        int err = SCSI_DH_RES_TEMP_UNAVAIL;
+        int stpg_len = 8;
+
+        /* Prepare the data buffer */
+        memset(h->buff, 0, stpg_len);
+        h->buff[4] = TPGS_STATE_OPTIMIZED & 0x0f;
+        h->buff[6] = (h->group_id >> 8) & 0x0f;
+        h->buff[7] = h->group_id & 0x0f;
+
+        rq = get_alua_req(sdev, h->buff, stpg_len, WRITE);
+        if (!rq)
+                goto done;
+
+        /* Prepare the command. */
+        rq->cmd[0] = MAINTENANCE_OUT;
+        rq->cmd[1] = MO_SET_TARGET_PGS;
+        rq->cmd[6] = (stpg_len >> 24) & 0xff;
+        rq->cmd[7] = (stpg_len >> 16) & 0xff;
+        rq->cmd[8] = (stpg_len >>  8) & 0xff;
+        rq->cmd[9] = stpg_len & 0xff;
+        rq->cmd_len = COMMAND_SIZE(MAINTENANCE_OUT);
+
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = h->senselen = 0;
+
+        err = blk_execute_rq(rq->q, NULL, rq, 1);
+        if (err == -EIO) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: stpg failed with %x\n",
+                            ALUA_DH_NAME, rq->errors);
+                h->senselen = rq->sense_len;
+                err = SCSI_DH_IO;
+        }
+        blk_put_request(rq);
+done:
+        return err;
+}
+
+/*
+ * alua_std_inquiry - Evaluate standard INQUIRY command
+ * @sdev: device to be checked
+ *
+ * Just extract the TPGS setting to find out if ALUA
+ * is supported.
+ */
+static int alua_std_inquiry(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        int err;
+
+        err = submit_std_inquiry(sdev, h);
+
+        if (err != SCSI_DH_OK)
+                return err;
+
+        /* Check TPGS setting */
+        h->tpgs = (h->inq[5] >> 4) & 0x3;
+        switch (h->tpgs) {
+        case TPGS_MODE_EXPLICIT|TPGS_MODE_IMPLICIT:
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: supports implicit and explicit TPGS\n",
+                            ALUA_DH_NAME);
+                break;
+        case TPGS_MODE_EXPLICIT:
+                sdev_printk(KERN_INFO, sdev, "%s: supports explicit TPGS\n",
+                            ALUA_DH_NAME);
+                break;
+        case TPGS_MODE_IMPLICIT:
+                sdev_printk(KERN_INFO, sdev, "%s: supports implicit TPGS\n",
+                            ALUA_DH_NAME);
+                break;
+        default:
+                h->tpgs = TPGS_MODE_NONE;
+                sdev_printk(KERN_INFO, sdev, "%s: not supported\n",
+                            ALUA_DH_NAME);
+                err = SCSI_DH_DEV_UNSUPP;
+                break;
+        }
+
+        return err;
+}
+
+/*
+ * alua_vpd_inquiry - Evaluate INQUIRY vpd page 0x83
+ * @sdev: device to be checked
+ *
+ * Extract the relative target port and the target port group
+ * descriptor from the list of identificators.
+ */
+static int alua_vpd_inquiry(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        int len;
+        unsigned err;
+        unsigned char *d;
+
+ retry:
+        err = submit_vpd_inquiry(sdev, h);
+
+        if (err != SCSI_DH_OK)
+                return err;
+
+        /* Check if vpd page exceeds initial buffer */
+        len = (h->buff[2] << 8) + h->buff[3] + 4;
+        if (len > h->bufflen) {
+                /* Resubmit with the correct length */
+                if (realloc_buffer(h, len)) {
+                        sdev_printk(KERN_WARNING, sdev,
+                                    "%s: kmalloc buffer failed\n",
+                                    ALUA_DH_NAME);
+                        /* Temporary failure, bypass */
+                        return SCSI_DH_DEV_TEMP_BUSY;
+                }
+                goto retry;
+        }
+
+        /*
+         * Now look for the correct descriptor.
+         */
+        d = h->buff + 4;
+        while (d < h->buff + len) {
+                switch (d[1] & 0xf) {
+                case 0x4:
+                        /* Relative target port */
+                        h->rel_port = (d[6] << 8) + d[7];
+                        break;
+                case 0x5:
+                        /* Target port group */
+                        h->group_id = (d[6] << 8) + d[7];
+                        break;
+                default:
+                        break;
+                }
+                d += d[3] + 4;
+        }
+
+        if (h->group_id == -1) {
+                /*
+                 * Internal error; TPGS supported but required
+                 * VPD identification descriptors not present.
+                 * Disable ALUA support
+                 */
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: No target port descriptors found\n",
+                            ALUA_DH_NAME);
+                h->state = TPGS_STATE_OPTIMIZED;
+                h->tpgs = TPGS_MODE_NONE;
+                err = SCSI_DH_DEV_UNSUPP;
+        } else {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: port group %02x rel port %02x\n",
+                            ALUA_DH_NAME, h->group_id, h->rel_port);
+        }
+
+        return err;
+}
+
+static char print_alua_state(int state)
+{
+        switch (state) {
+        case TPGS_STATE_OPTIMIZED:
+                return 'A';
+        case TPGS_STATE_NONOPTIMIZED:
+                return 'N';
+        case TPGS_STATE_STANDBY:
+                return 'S';
+        case TPGS_STATE_UNAVAILABLE:
+                return 'U';
+        case TPGS_STATE_OFFLINE:
+                return 'O';
+        case TPGS_STATE_TRANSITIONING:
+                return 'T';
+        default:
+                return 'X';
+        }
+}
+
+static int alua_check_sense(struct scsi_device *sdev,
+                            struct scsi_sense_hdr *sense_hdr)
+{
+        switch (sense_hdr->sense_key) {
+        case NOT_READY:
+                if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0a)
+                        /*
+                         * LUN Not Accessible - ALUA state transition
+                         */
+                        return NEEDS_RETRY;
+                if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0b)
+                        /*
+                         * LUN Not Accessible -- Target port in standby state
+                         */
+                        return SUCCESS;
+                if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0c)
+                        /*
+                         * LUN Not Accessible -- Target port in unavailable state
+                         */
+                        return SUCCESS;
+                if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x12)
+                        /*
+                         * LUN Not Ready -- Offline
+                         */
+                        return SUCCESS;
+                break;
+        case UNIT_ATTENTION:
+                if (sense_hdr->asc == 0x29 && sense_hdr->ascq == 0x00)
+                        /*
+                         * Power On, Reset, or Bus Device Reset, just retry.
+                         */
+                        return NEEDS_RETRY;
+                if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x06) {
+                        /*
+                         * ALUA state changed
+                         */
+                        return NEEDS_RETRY;
+                }
+                if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x07) {
+                        /*
+                         * Implicit ALUA state transition failed
+                         */
+                        return NEEDS_RETRY;
+                }
+                break;
+        }
+
+        return SCSI_RETURN_NOT_HANDLED;
+}
+
+/*
+ * alua_stpg - Evaluate SET TARGET GROUP STATES
+ * @sdev: the device to be evaluated
+ * @state: the new target group state
+ *
+ * Send a SET TARGET GROUP STATES command to the device.
+ * We only have to test here if we should resubmit the command;
+ * any other error is assumed as a failure.
+ */
+static int alua_stpg(struct scsi_device *sdev, int state,
+                     struct alua_dh_data *h)
+{
+        struct scsi_sense_hdr sense_hdr;
+        unsigned err;
+        int retry = ALUA_FAILOVER_RETRIES;
+
+ retry:
+        err = submit_stpg(sdev, h);
+        if (err == SCSI_DH_IO && h->senselen > 0) {
+                err = scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE,
+                                           &sense_hdr);
+                if (!err)
+                        return SCSI_DH_IO;
+                err = alua_check_sense(sdev, &sense_hdr);
+                if (retry > 0 && err == NEEDS_RETRY) {
+                        retry--;
+                        goto retry;
+                }
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: stpg sense code: %02x/%02x/%02x\n",
+                            ALUA_DH_NAME, sense_hdr.sense_key,
+                            sense_hdr.asc, sense_hdr.ascq);
+                err = SCSI_DH_IO;
+        }
+        if (err == SCSI_DH_OK) {
+                h->state = state;
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: port group %02x switched to state %c\n",
+                            ALUA_DH_NAME, h->group_id,
+                            print_alua_state(h->state) );
+        }
+        return err;
+}
+
+/*
+ * alua_rtpg - Evaluate REPORT TARGET GROUP STATES
+ * @sdev: the device to be evaluated.
+ *
+ * Evaluate the Target Port Group State.
+ * Returns SCSI_DH_DEV_OFFLINED if the path is
+ * found to be unuseable.
+ */
+static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        struct scsi_sense_hdr sense_hdr;
+        int len, k, off, valid_states = 0;
+        char *ucp;
+        unsigned err;
+
+ retry:
+        err = submit_rtpg(sdev, h);
+
+        if (err == SCSI_DH_IO && h->senselen > 0) {
+                err = scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE,
+                                           &sense_hdr);
+                if (!err)
+                        return SCSI_DH_IO;
+
+                err = alua_check_sense(sdev, &sense_hdr);
+                if (err == NEEDS_RETRY)
+                        goto retry;
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: rtpg sense code %02x/%02x/%02x\n",
+                            ALUA_DH_NAME, sense_hdr.sense_key,
+                            sense_hdr.asc, sense_hdr.ascq);
+                err = SCSI_DH_IO;
+        }
+        if (err != SCSI_DH_OK)
+                return err;
+
+        len = (h->buff[0] << 24) + (h->buff[1] << 16) +
+                (h->buff[2] << 8) + h->buff[3] + 4;
+
+        if (len > h->bufflen) {
+                /* Resubmit with the correct length */
+                if (realloc_buffer(h, len)) {
+                        sdev_printk(KERN_WARNING, sdev,
+                                    "%s: kmalloc buffer failed\n",__func__);
+                        /* Temporary failure, bypass */
+                        return SCSI_DH_DEV_TEMP_BUSY;
+                }
+                goto retry;
+        }
+
+        for (k = 4, ucp = h->buff + 4; k < len; k += off, ucp += off) {
+                if (h->group_id == (ucp[2] << 8) + ucp[3]) {
+                        h->state = ucp[0] & 0x0f;
+                        valid_states = ucp[1];
+                }
+                off = 8 + (ucp[7] * 4);
+        }
+
+        sdev_printk(KERN_INFO, sdev,
+                    "%s: port group %02x state %c supports %c%c%c%c%c%c\n",
+                    ALUA_DH_NAME, h->group_id, print_alua_state(h->state),
+                    valid_states&TPGS_SUPPORT_TRANSITION?'T':'t',
+                    valid_states&TPGS_SUPPORT_OFFLINE?'O':'o',
+                    valid_states&TPGS_SUPPORT_UNAVAILABLE?'U':'u',
+                    valid_states&TPGS_SUPPORT_STANDBY?'S':'s',
+                    valid_states&TPGS_SUPPORT_NONOPTIMIZED?'N':'n',
+                    valid_states&TPGS_SUPPORT_OPTIMIZED?'A':'a');
+
+        if (h->tpgs & TPGS_MODE_EXPLICIT) {
+                switch (h->state) {
+                case TPGS_STATE_TRANSITIONING:
+                        /* State transition, retry */
+                        goto retry;
+                        break;
+                case TPGS_STATE_OFFLINE:
+                        /* Path is offline, fail */
+                        err = SCSI_DH_DEV_OFFLINED;
+                        break;
+                default:
+                        break;
+                }
+        } else {
+                /* Only Implicit ALUA support */
+                if (h->state == TPGS_STATE_OPTIMIZED ||
+                    h->state == TPGS_STATE_NONOPTIMIZED ||
+                    h->state == TPGS_STATE_STANDBY)
+                        /* Useable path if active */
+                        err = SCSI_DH_OK;
+                else
+                        /* Path unuseable for unavailable/offline */
+                        err = SCSI_DH_DEV_OFFLINED;
+        }
+        return err;
+}
+
+/*
+ * alua_initialize - Initialize ALUA state
+ * @sdev: the device to be initialized
+ *
+ * For the prep_fn to work correctly we have
+ * to initialize the ALUA state for the device.
+ */
+static int alua_initialize(struct scsi_device *sdev, struct alua_dh_data *h)
+{
+        int err;
+
+        err = alua_std_inquiry(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto out;
+
+        err = alua_vpd_inquiry(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto out;
+
+        err = alua_rtpg(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto out;
+
+out:
+        return err;
+}
+
+/*
+ * alua_activate - activate a path
+ * @sdev: device on the path to be activated
+ *
+ * We're currently switching the port group to be activated only and
+ * let the array figure out the rest.
+ * There may be other arrays which require us to switch all port groups
+ * based on a certain policy. But until we actually encounter them it
+ * should be okay.
+ */
+static int alua_activate(struct scsi_device *sdev)
+{
+        struct alua_dh_data *h = get_alua_data(sdev);
+        int err = SCSI_DH_OK;
+
+        if (h->group_id != -1) {
+                err = alua_rtpg(sdev, h);
+                if (err != SCSI_DH_OK)
+                        goto out;
+        }
+
+        if (h->tpgs == TPGS_MODE_EXPLICIT && h->state != TPGS_STATE_OPTIMIZED)
+                err = alua_stpg(sdev, TPGS_STATE_OPTIMIZED, h);
+
+out:
+        return err;
+}
+
+/*
+ * alua_prep_fn - request callback
+ *
+ * Fail I/O to all paths not in state
+ * active/optimized or active/non-optimized.
+ */
+static int alua_prep_fn(struct scsi_device *sdev, struct request *req)
+{
+        struct alua_dh_data *h = get_alua_data(sdev);
+        int ret = BLKPREP_OK;
+
+        if (h->state != TPGS_STATE_OPTIMIZED &&
+            h->state != TPGS_STATE_NONOPTIMIZED) {
+                ret = BLKPREP_KILL;
+                req->cmd_flags |= REQ_QUIET;
+        }
+        return ret;
+
+}
+
+const struct scsi_dh_devlist alua_dev_list[] = {
+        {"HP", "MSA VOLUME" },
+        {"HP", "HSV101" },
+        {"HP", "HSV111" },
+        {"HP", "HSV200" },
+        {"HP", "HSV210" },
+        {"HP", "HSV300" },
+        {"IBM", "2107900" },
+        {"IBM", "2145" },
+        {"Pillar", "Axiom" },
+        {NULL, NULL}
+};
+
+static int alua_bus_attach(struct scsi_device *sdev);
+static void alua_bus_detach(struct scsi_device *sdev);
+
+static struct scsi_device_handler alua_dh = {
+        .name = ALUA_DH_NAME,
+        .module = THIS_MODULE,
+        .devlist = alua_dev_list,
+        .attach = alua_bus_attach,
+        .detach = alua_bus_detach,
+        .prep_fn = alua_prep_fn,
+        .check_sense = alua_check_sense,
+        .activate = alua_activate,
+};
+
+/*
+ * alua_bus_attach - Attach device handler
+ * @sdev: device to be attached to
+ */
+static int alua_bus_attach(struct scsi_device *sdev)
+{
+        struct scsi_dh_data *scsi_dh_data;
+        struct alua_dh_data *h;
+        unsigned long flags;
+        int err = SCSI_DH_OK;
+
+        scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
+                               + sizeof(*h) , GFP_KERNEL);
+        if (!scsi_dh_data) {
+                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
+                            ALUA_DH_NAME);
+                return -ENOMEM;
+        }
+
+        scsi_dh_data->scsi_dh = &alua_dh;
+        h = (struct alua_dh_data *) scsi_dh_data->buf;
+        h->tpgs = TPGS_MODE_UNINITIALIZED;
+        h->state = TPGS_STATE_OPTIMIZED;
+        h->group_id = -1;
+        h->rel_port = -1;
+        h->buff = h->inq;
+        h->bufflen = ALUA_INQUIRY_SIZE;
+
+        err = alua_initialize(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto failed;
+
+        if (!try_module_get(THIS_MODULE))
+                goto failed;
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        sdev->scsi_dh_data = scsi_dh_data;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+
+        return 0;
+
+failed:
+        kfree(scsi_dh_data);
+        sdev_printk(KERN_ERR, sdev, "%s: not attached\n", ALUA_DH_NAME);
+        return -EINVAL;
+}
+
+/*
+ * alua_bus_detach - Detach device handler
+ * @sdev: device to be detached from
+ */
+static void alua_bus_detach(struct scsi_device *sdev)
+{
+        struct scsi_dh_data *scsi_dh_data;
+        struct alua_dh_data *h;
+        unsigned long flags;
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        scsi_dh_data = sdev->scsi_dh_data;
+        sdev->scsi_dh_data = NULL;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+
+        h = (struct alua_dh_data *) scsi_dh_data->buf;
+        if (h->buff && h->inq != h->buff)
+                kfree(h->buff);
+        kfree(scsi_dh_data);
+        module_put(THIS_MODULE);
+        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", ALUA_DH_NAME);
+}
+
+static int __init alua_init(void)
+{
+        int r;
+
+        r = scsi_register_device_handler(&alua_dh);
+        if (r != 0)
+                printk(KERN_ERR "%s: Failed to register scsi device handler",
+                        ALUA_DH_NAME);
+        return r;
+}
+
+static void __exit alua_exit(void)
+{
+        scsi_unregister_device_handler(&alua_dh);
+}
+
+module_init(alua_init);
+module_exit(alua_exit);
+
+MODULE_DESCRIPTION("DM Multipath ALUA support");
+MODULE_AUTHOR("Hannes Reinecke <hare@suse.de>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(ALUA_DH_VER);
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index f2467e936e55..aa46b131b20e 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -25,28 +25,31 @@
 #include <scsi/scsi_dh.h>
 #include <scsi/scsi_device.h>
 
-#define CLARIION_NAME                   "emc_clariion"
+#define CLARIION_NAME                   "emc"
 
 #define CLARIION_TRESPASS_PAGE          0x22
-#define CLARIION_BUFFER_SIZE            0x80
+#define CLARIION_BUFFER_SIZE            0xFC
 #define CLARIION_TIMEOUT                (60 * HZ)
 #define CLARIION_RETRIES                3
 #define CLARIION_UNBOUND_LU             -1
+#define CLARIION_SP_A                   0
+#define CLARIION_SP_B                   1
 
-static unsigned char long_trespass[] = {
-        0, 0, 0, 0,
-        CLARIION_TRESPASS_PAGE, /* Page code */
-        0x09,                   /* Page length - 2 */
-        0x81,                   /* Trespass code + Honor reservation bit */
-        0xff, 0xff,             /* Trespass target */
-        0, 0, 0, 0, 0, 0        /* Reserved bytes / unknown */
-};
+/* Flags */
+#define CLARIION_SHORT_TRESPASS         1
+#define CLARIION_HONOR_RESERVATIONS     2
 
-static unsigned char long_trespass_hr[] = {
-        0, 0, 0, 0,
+/* LUN states */
+#define CLARIION_LUN_UNINITIALIZED      -1
+#define CLARIION_LUN_UNBOUND            0
+#define CLARIION_LUN_BOUND              1
+#define CLARIION_LUN_OWNED              2
+
+static unsigned char long_trespass[] = {
+        0, 0, 0, 0, 0, 0, 0, 0,
         CLARIION_TRESPASS_PAGE, /* Page code */
         0x09,                   /* Page length - 2 */
-        0x01,                   /* Trespass code + Honor reservation bit */
+        0x01,                   /* Trespass code */
         0xff, 0xff,             /* Trespass target */
         0, 0, 0, 0, 0, 0        /* Reserved bytes / unknown */
 };
@@ -55,39 +58,56 @@ static unsigned char short_trespass[] = {
         0, 0, 0, 0,
         CLARIION_TRESPASS_PAGE, /* Page code */
         0x02,                   /* Page length - 2 */
-        0x81,                   /* Trespass code + Honor reservation bit */
+        0x01,                   /* Trespass code */
         0xff,                   /* Trespass target */
 };
 
-static unsigned char short_trespass_hr[] = {
-        0, 0, 0, 0,
-        CLARIION_TRESPASS_PAGE, /* Page code */
-        0x02,                   /* Page length - 2 */
-        0x01,                   /* Trespass code + Honor reservation bit */
-        0xff,                   /* Trespass target */
+static const char * lun_state[] =
+{
+    "not bound",
+    "bound",
+    "owned",
 };
 
 struct clariion_dh_data {
         /*
+         * Flags:
+         *  CLARIION_SHORT_TRESPASS
          * Use short trespass command (FC-series) or the long version
          * (default for AX/CX CLARiiON arrays).
-         */
-        unsigned short_trespass;
-        /*
+         *
+         *  CLARIION_HONOR_RESERVATIONS
          * Whether or not (default) to honor SCSI reservations when
          * initiating a switch-over.
          */
-        unsigned hr;
-        /* I/O buffer for both MODE_SELECT and INQUIRY commands. */
+        unsigned flags;
+        /*
+         * I/O buffer for both MODE_SELECT and INQUIRY commands.
+         */
         char buffer[CLARIION_BUFFER_SIZE];
         /*
          * SCSI sense buffer for commands -- assumes serial issuance
          * and completion sequence of all commands for same multipath.
          */
         unsigned char sense[SCSI_SENSE_BUFFERSIZE];
-        /* which SP (A=0,B=1,UNBOUND=-1) is dflt SP for path's mapped dev */
+        unsigned int senselen;
+        /*
+         * LUN state
+         */
+        int lun_state;
+        /*
+         * SP Port number
+         */
+        int port;
+        /*
+         * which SP (A=0,B=1,UNBOUND=-1) is the default SP for this
+         * path's mapped LUN
+         */
         int default_sp;
-        /* which SP (A=0,B=1,UNBOUND=-1) is active for path's mapped dev */
+        /*
+         * which SP (A=0,B=1,UNBOUND=-1) is the active SP for this
+         * path's mapped LUN
+         */
         int current_sp;
 };
 
@@ -102,19 +122,16 @@ static inline struct clariion_dh_data
 /*
  * Parse MODE_SELECT cmd reply.
  */
-static int trespass_endio(struct scsi_device *sdev, int result)
+static int trespass_endio(struct scsi_device *sdev, char *sense)
 {
-        int err = SCSI_DH_OK;
+        int err = SCSI_DH_IO;
         struct scsi_sense_hdr sshdr;
-        struct clariion_dh_data *csdev = get_clariion_data(sdev);
-        char *sense = csdev->sense;
 
-        if (status_byte(result) == CHECK_CONDITION &&
-            scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, &sshdr)) {
-                sdev_printk(KERN_ERR, sdev, "Found valid sense data 0x%2x, "
+        if (!scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, &sshdr)) {
+                sdev_printk(KERN_ERR, sdev, "%s: Found valid sense data 0x%2x, "
                             "0x%2x, 0x%2x while sending CLARiiON trespass "
-                            "command.\n", sshdr.sense_key, sshdr.asc,
-                             sshdr.ascq);
+                            "command.\n", CLARIION_NAME, sshdr.sense_key,
+                            sshdr.asc, sshdr.ascq);
 
                 if ((sshdr.sense_key == 0x05) && (sshdr.asc == 0x04) &&
                      (sshdr.ascq == 0x00)) {
@@ -122,9 +139,9 @@ static int trespass_endio(struct scsi_device *sdev, int result)
                          * Array based copy in progress -- do not send
                          * mode_select or copy will be aborted mid-stream.
                          */
-                        sdev_printk(KERN_INFO, sdev, "Array Based Copy in "
+                        sdev_printk(KERN_INFO, sdev, "%s: Array Based Copy in "
                                     "progress while sending CLARiiON trespass "
-                                    "command.\n");
+                                    "command.\n", CLARIION_NAME);
                         err = SCSI_DH_DEV_TEMP_BUSY;
                 } else if ((sshdr.sense_key == 0x02) && (sshdr.asc == 0x04) &&
                             (sshdr.ascq == 0x03)) {
@@ -132,160 +149,153 @@ static int trespass_endio(struct scsi_device *sdev, int result)
                          * LUN Not Ready - Manual Intervention Required
                          * indicates in-progress ucode upgrade (NDU).
                          */
-                        sdev_printk(KERN_INFO, sdev, "Detected in-progress "
+                        sdev_printk(KERN_INFO, sdev, "%s: Detected in-progress "
                                     "ucode upgrade NDU operation while sending "
-                                    "CLARiiON trespass command.\n");
+                                    "CLARiiON trespass command.\n", CLARIION_NAME);
                         err = SCSI_DH_DEV_TEMP_BUSY;
                 } else
                         err = SCSI_DH_DEV_FAILED;
-        } else if (result) {
-                sdev_printk(KERN_ERR, sdev, "Error 0x%x while sending "
-                            "CLARiiON trespass command.\n", result);
-                err = SCSI_DH_IO;
+        } else {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: failed to send MODE SELECT, no sense available\n",
+                            CLARIION_NAME);
         }
-
         return err;
 }
 
-static int parse_sp_info_reply(struct scsi_device *sdev, int result,
-                int *default_sp, int *current_sp, int *new_current_sp)
+static int parse_sp_info_reply(struct scsi_device *sdev,
+                               struct clariion_dh_data *csdev)
 {
         int err = SCSI_DH_OK;
-        struct clariion_dh_data *csdev = get_clariion_data(sdev);
 
-        if (result == 0) {
-                /* check for in-progress ucode upgrade (NDU) */
-                if (csdev->buffer[48] != 0) {
-                        sdev_printk(KERN_NOTICE, sdev, "Detected in-progress "
-                               "ucode upgrade NDU operation while finding "
-                               "current active SP.");
-                        err = SCSI_DH_DEV_TEMP_BUSY;
-                } else {
-                        *default_sp = csdev->buffer[5];
-
-                        if (csdev->buffer[4] == 2)
-                                /* SP for path is current */
-                                *current_sp = csdev->buffer[8];
-                        else {
-                                if (csdev->buffer[4] == 1)
-                                        /* SP for this path is NOT current */
-                                        if (csdev->buffer[8] == 0)
-                                                *current_sp = 1;
-                                        else
-                                                *current_sp = 0;
-                                else
-                                        /* unbound LU or LUNZ */
-                                        *current_sp = CLARIION_UNBOUND_LU;
-                        }
-                        *new_current_sp =  csdev->buffer[8];
-                }
-        } else {
-                struct scsi_sense_hdr sshdr;
-
-                err = SCSI_DH_IO;
-
-                if (scsi_normalize_sense(csdev->sense, SCSI_SENSE_BUFFERSIZE,
-                                                           &sshdr))
-                        sdev_printk(KERN_ERR, sdev, "Found valid sense data "
-                              "0x%2x, 0x%2x, 0x%2x while finding current "
-                              "active SP.", sshdr.sense_key, sshdr.asc,
-                              sshdr.ascq);
-                else
-                        sdev_printk(KERN_ERR, sdev, "Error 0x%x finding "
-                              "current active SP.", result);
+        /* check for in-progress ucode upgrade (NDU) */
+        if (csdev->buffer[48] != 0) {
+                sdev_printk(KERN_NOTICE, sdev, "%s: Detected in-progress "
+                            "ucode upgrade NDU operation while finding "
+                            "current active SP.", CLARIION_NAME);
+                err = SCSI_DH_DEV_TEMP_BUSY;
+                goto out;
+        }
+        if (csdev->buffer[4] < 0 || csdev->buffer[4] > 2) {
+                /* Invalid buffer format */
+                sdev_printk(KERN_NOTICE, sdev,
+                            "%s: invalid VPD page 0xC0 format\n",
+                            CLARIION_NAME);
+                err = SCSI_DH_NOSYS;
+                goto out;
+        }
+        switch (csdev->buffer[28] & 0x0f) {
+        case 6:
+                sdev_printk(KERN_NOTICE, sdev,
+                            "%s: ALUA failover mode detected\n",
+                            CLARIION_NAME);
+                break;
+        case 4:
+                /* Linux failover */
+                break;
+        default:
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: Invalid failover mode %d\n",
+                            CLARIION_NAME, csdev->buffer[28] & 0x0f);
+                err = SCSI_DH_NOSYS;
+                goto out;
         }
 
+        csdev->default_sp = csdev->buffer[5];
+        csdev->lun_state = csdev->buffer[4];
+        csdev->current_sp = csdev->buffer[8];
+        csdev->port = csdev->buffer[7];
+
+out:
         return err;
 }
 
-static int sp_info_endio(struct scsi_device *sdev, int result,
-                                        int mode_select_sent, int *done)
+#define emc_default_str "FC (Legacy)"
+
+static char * parse_sp_model(struct scsi_device *sdev, unsigned char *buffer)
 {
-        struct clariion_dh_data *csdev = get_clariion_data(sdev);
-        int err_flags, default_sp, current_sp, new_current_sp;
+        unsigned char len = buffer[4] + 5;
+        char *sp_model = NULL;
+        unsigned char sp_len, serial_len;
+
+        if (len < 160) {
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: Invalid information section length %d\n",
+                            CLARIION_NAME, len);
+                /* Check for old FC arrays */
+                if (!strncmp(buffer + 8, "DGC", 3)) {
+                        /* Old FC array, not supporting extended information */
+                        sp_model = emc_default_str;
+                }
+                goto out;
+        }
 
-        err_flags = parse_sp_info_reply(sdev, result, &default_sp,
-                                             &current_sp, &new_current_sp);
+        /*
+         * Parse extended information for SP model number
+         */
+        serial_len = buffer[160];
+        if (serial_len == 0 || serial_len + 161 > len) {
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: Invalid array serial number length %d\n",
+                            CLARIION_NAME, serial_len);
+                goto out;
+        }
+        sp_len = buffer[99];
+        if (sp_len == 0 || serial_len + sp_len + 161 > len) {
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: Invalid model number length %d\n",
+                            CLARIION_NAME, sp_len);
+                goto out;
+        }
+        sp_model = &buffer[serial_len + 161];
+        /* Strip whitespace at the end */
+        while (sp_len > 1 && sp_model[sp_len - 1] == ' ')
+                sp_len--;
 
-        if (err_flags != SCSI_DH_OK)
-                goto done;
+        sp_model[sp_len] = '\0';
 
-        if (mode_select_sent) {
-                csdev->default_sp = default_sp;
-                csdev->current_sp = current_sp;
-        } else {
-                /*
-                 * Issue the actual module_selec request IFF either
-                 * (1) we do not know the identity of the current SP OR
-                 * (2) what we think we know is actually correct.
-                 */
-                if ((current_sp != CLARIION_UNBOUND_LU) &&
-                    (new_current_sp != current_sp)) {
-
-                        csdev->default_sp = default_sp;
-                        csdev->current_sp = current_sp;
-
-                        sdev_printk(KERN_INFO, sdev, "Ignoring path group "
-                               "switch-over command for CLARiiON SP%s since "
-                               " mapped device is already initialized.",
-                               current_sp ? "B" : "A");
-                        if (done)
-                                *done = 1; /* as good as doing it */
-                }
-        }
-done:
-        return err_flags;
+out:
+        return sp_model;
 }
 
 /*
-* Get block request for REQ_BLOCK_PC command issued to path.  Currently
-* limited to MODE_SELECT (trespass) and INQUIRY (VPD page 0xC0) commands.
-*
-* Uses data and sense buffers in hardware handler context structure and
-* assumes serial servicing of commands, both issuance and completion.
-*/
-static struct request *get_req(struct scsi_device *sdev, int cmd)
+ * Get block request for REQ_BLOCK_PC command issued to path.  Currently
+ * limited to MODE_SELECT (trespass) and INQUIRY (VPD page 0xC0) commands.
+ *
+ * Uses data and sense buffers in hardware handler context structure and
+ * assumes serial servicing of commands, both issuance and completion.
+ */
+static struct request *get_req(struct scsi_device *sdev, int cmd,
+                                unsigned char *buffer)
 {
-        struct clariion_dh_data *csdev = get_clariion_data(sdev);
         struct request *rq;
-        unsigned char *page22;
         int len = 0;
 
         rq = blk_get_request(sdev->request_queue,
-                        (cmd == MODE_SELECT) ? WRITE : READ, GFP_ATOMIC);
+                        (cmd == MODE_SELECT) ? WRITE : READ, GFP_NOIO);
         if (!rq) {
                 sdev_printk(KERN_INFO, sdev, "get_req: blk_get_request failed");
                 return NULL;
         }
 
-        memset(&rq->cmd, 0, BLK_MAX_CDB);
+        memset(rq->cmd, 0, BLK_MAX_CDB);
+        rq->cmd_len = COMMAND_SIZE(cmd);
         rq->cmd[0] = cmd;
-        rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);
 
         switch (cmd) {
         case MODE_SELECT:
-                if (csdev->short_trespass) {
-                        page22 = csdev->hr ? short_trespass_hr : short_trespass;
-                        len = sizeof(short_trespass);
-                } else {
-                        page22 = csdev->hr ? long_trespass_hr : long_trespass;
-                        len = sizeof(long_trespass);
-                }
-                /*
-                 * Can't DMA from kernel BSS -- must copy selected trespass
-                 * command mode page contents to context buffer which is
-                 * allocated by kmalloc.
-                 */
-                BUG_ON((len > CLARIION_BUFFER_SIZE));
-                memcpy(csdev->buffer, page22, len);
+                len = sizeof(short_trespass);
+                rq->cmd_flags |= REQ_RW;
+                rq->cmd[1] = 0x10;
+                break;
+        case MODE_SELECT_10:
+                len = sizeof(long_trespass);
                 rq->cmd_flags |= REQ_RW;
                 rq->cmd[1] = 0x10;
                 break;
         case INQUIRY:
-                rq->cmd[1] = 0x1;
-                rq->cmd[2] = 0xC0;
                 len = CLARIION_BUFFER_SIZE;
-                memset(csdev->buffer, 0, CLARIION_BUFFER_SIZE);
+                memset(buffer, 0, len);
                 break;
         default:
                 BUG_ON(1);
@@ -298,47 +308,94 @@ static struct request *get_req(struct scsi_device *sdev, int cmd)
         rq->timeout = CLARIION_TIMEOUT;
         rq->retries = CLARIION_RETRIES;
 
-        rq->sense = csdev->sense;
-        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
-        rq->sense_len = 0;
-
-        if (blk_rq_map_kern(sdev->request_queue, rq, csdev->buffer,
-                                                        len, GFP_ATOMIC)) {
-                __blk_put_request(rq->q, rq);
+        if (blk_rq_map_kern(rq->q, rq, buffer, len, GFP_NOIO)) {
+                blk_put_request(rq);
                 return NULL;
         }
 
         return rq;
 }
 
-static int send_cmd(struct scsi_device *sdev, int cmd)
+static int send_inquiry_cmd(struct scsi_device *sdev, int page,
+                            struct clariion_dh_data *csdev)
 {
-        struct request *rq = get_req(sdev, cmd);
+        struct request *rq = get_req(sdev, INQUIRY, csdev->buffer);
+        int err;
 
         if (!rq)
                 return SCSI_DH_RES_TEMP_UNAVAIL;
 
-        return blk_execute_rq(sdev->request_queue, NULL, rq, 1);
+        rq->sense = csdev->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = csdev->senselen = 0;
+
+        rq->cmd[0] = INQUIRY;
+        if (page != 0) {
+                rq->cmd[1] = 1;
+                rq->cmd[2] = page;
+        }
+        err = blk_execute_rq(sdev->request_queue, NULL, rq, 1);
+        if (err == -EIO) {
+                sdev_printk(KERN_INFO, sdev,
+                            "%s: failed to send %s INQUIRY: %x\n",
+                            CLARIION_NAME, page?"EVPD":"standard",
+                            rq->errors);
+                csdev->senselen = rq->sense_len;
+                err = SCSI_DH_IO;
+        }
+
+        blk_put_request(rq);
+
+        return err;
 }
 
-static int clariion_activate(struct scsi_device *sdev)
+static int send_trespass_cmd(struct scsi_device *sdev,
+                            struct clariion_dh_data *csdev)
 {
-        int result, done = 0;
+        struct request *rq;
+        unsigned char *page22;
+        int err, len, cmd;
+
+        if (csdev->flags & CLARIION_SHORT_TRESPASS) {
+                page22 = short_trespass;
+                if (!(csdev->flags & CLARIION_HONOR_RESERVATIONS))
+                        /* Set Honor Reservations bit */
+                        page22[6] |= 0x80;
+                len = sizeof(short_trespass);
+                cmd = MODE_SELECT;
+        } else {
+                page22 = long_trespass;
+                if (!(csdev->flags & CLARIION_HONOR_RESERVATIONS))
+                        /* Set Honor Reservations bit */
+                        page22[10] |= 0x80;
+                len = sizeof(long_trespass);
+                cmd = MODE_SELECT_10;
+        }
+        BUG_ON((len > CLARIION_BUFFER_SIZE));
+        memcpy(csdev->buffer, page22, len);
 
-        result = send_cmd(sdev, INQUIRY);
-        result = sp_info_endio(sdev, result, 0, &done);
-        if (result || done)
-                goto done;
+        rq = get_req(sdev, cmd, csdev->buffer);
+        if (!rq)
+                return SCSI_DH_RES_TEMP_UNAVAIL;
 
-        result = send_cmd(sdev, MODE_SELECT);
-        result = trespass_endio(sdev, result);
-        if (result)
-                goto done;
+        rq->sense = csdev->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = csdev->senselen = 0;
 
-        result = send_cmd(sdev, INQUIRY);
-        result = sp_info_endio(sdev, result, 1, NULL);
-done:
-        return result;
+        err = blk_execute_rq(sdev->request_queue, NULL, rq, 1);
+        if (err == -EIO) {
+                if (rq->sense_len) {
+                        err = trespass_endio(sdev, csdev->sense);
+                } else {
+                        sdev_printk(KERN_INFO, sdev,
+                                    "%s: failed to send MODE SELECT: %x\n",
+                                    CLARIION_NAME, rq->errors);
+                }
+        }
+
+        blk_put_request(rq);
+
+        return err;
 }
 
 static int clariion_check_sense(struct scsi_device *sdev,
@@ -386,99 +443,215 @@ static int clariion_check_sense(struct scsi_device *sdev,
                 break;
         }
 
-        /* success just means we do not care what scsi-ml does */
-        return SUCCESS;
+        return SCSI_RETURN_NOT_HANDLED;
+}
+
+static int clariion_prep_fn(struct scsi_device *sdev, struct request *req)
+{
+        struct clariion_dh_data *h = get_clariion_data(sdev);
+        int ret = BLKPREP_OK;
+
+        if (h->lun_state != CLARIION_LUN_OWNED) {
+                ret = BLKPREP_KILL;
+                req->cmd_flags |= REQ_QUIET;
+        }
+        return ret;
+
+}
+
+static int clariion_std_inquiry(struct scsi_device *sdev,
+                                struct clariion_dh_data *csdev)
+{
+        int err;
+        char *sp_model;
+
+        err = send_inquiry_cmd(sdev, 0, csdev);
+        if (err != SCSI_DH_OK && csdev->senselen) {
+                struct scsi_sense_hdr sshdr;
+
+                if (scsi_normalize_sense(csdev->sense, SCSI_SENSE_BUFFERSIZE,
+                                         &sshdr)) {
+                        sdev_printk(KERN_ERR, sdev, "%s: INQUIRY sense code "
+                                    "%02x/%02x/%02x\n", CLARIION_NAME,
+                                    sshdr.sense_key, sshdr.asc, sshdr.ascq);
+                }
+                err = SCSI_DH_IO;
+                goto out;
+        }
+
+        sp_model = parse_sp_model(sdev, csdev->buffer);
+        if (!sp_model) {
+                err = SCSI_DH_DEV_UNSUPP;
+                goto out;
+        }
+
+        /*
+         * FC Series arrays do not support long trespass
+         */
+        if (!strlen(sp_model) || !strncmp(sp_model, "FC",2))
+                csdev->flags |= CLARIION_SHORT_TRESPASS;
+
+        sdev_printk(KERN_INFO, sdev,
+                    "%s: detected Clariion %s, flags %x\n",
+                    CLARIION_NAME, sp_model, csdev->flags);
+out:
+        return err;
 }
 
-static const struct {
-        char *vendor;
-        char *model;
-} clariion_dev_list[] = {
+static int clariion_send_inquiry(struct scsi_device *sdev,
+                                 struct clariion_dh_data *csdev)
+{
+        int err, retry = CLARIION_RETRIES;
+
+retry:
+        err = send_inquiry_cmd(sdev, 0xC0, csdev);
+        if (err != SCSI_DH_OK && csdev->senselen) {
+                struct scsi_sense_hdr sshdr;
+
+                err = scsi_normalize_sense(csdev->sense, SCSI_SENSE_BUFFERSIZE,
+                                           &sshdr);
+                if (!err)
+                        return SCSI_DH_IO;
+
+                err = clariion_check_sense(sdev, &sshdr);
+                if (retry > 0 && err == NEEDS_RETRY) {
+                        retry--;
+                        goto retry;
+                }
+                sdev_printk(KERN_ERR, sdev, "%s: INQUIRY sense code "
+                            "%02x/%02x/%02x\n", CLARIION_NAME,
+                              sshdr.sense_key, sshdr.asc, sshdr.ascq);
+                err = SCSI_DH_IO;
+        } else {
+                err = parse_sp_info_reply(sdev, csdev);
+        }
+        return err;
+}
+
+static int clariion_activate(struct scsi_device *sdev)
+{
+        struct clariion_dh_data *csdev = get_clariion_data(sdev);
+        int result;
+
+        result = clariion_send_inquiry(sdev, csdev);
+        if (result != SCSI_DH_OK)
+                goto done;
+
+        if (csdev->lun_state == CLARIION_LUN_OWNED)
+                goto done;
+
+        result = send_trespass_cmd(sdev, csdev);
+        if (result != SCSI_DH_OK)
+                goto done;
+        sdev_printk(KERN_INFO, sdev,"%s: %s trespass command sent\n",
+                    CLARIION_NAME,
+                    csdev->flags&CLARIION_SHORT_TRESPASS?"short":"long" );
+
+        /* Update status */
+        result = clariion_send_inquiry(sdev, csdev);
+        if (result != SCSI_DH_OK)
+                goto done;
+
+done:
+        sdev_printk(KERN_INFO, sdev,
+                    "%s: at SP %c Port %d (%s, default SP %c)\n",
+                    CLARIION_NAME, csdev->current_sp + 'A',
+                    csdev->port, lun_state[csdev->lun_state],
+                    csdev->default_sp + 'A');
+
+        return result;
+}
+
+const struct scsi_dh_devlist clariion_dev_list[] = {
         {"DGC", "RAID"},
         {"DGC", "DISK"},
+        {"DGC", "VRAID"},
         {NULL, NULL},
 };
 
-static int clariion_bus_notify(struct notifier_block *, unsigned long, void *);
+static int clariion_bus_attach(struct scsi_device *sdev);
+static void clariion_bus_detach(struct scsi_device *sdev);
 
 static struct scsi_device_handler clariion_dh = {
         .name           = CLARIION_NAME,
         .module         = THIS_MODULE,
-        .nb.notifier_call = clariion_bus_notify,
+        .devlist        = clariion_dev_list,
+        .attach         = clariion_bus_attach,
+        .detach         = clariion_bus_detach,
         .check_sense    = clariion_check_sense,
         .activate       = clariion_activate,
+        .prep_fn        = clariion_prep_fn,
 };
 
 /*
  * TODO: need some interface so we can set trespass values
  */
-static int clariion_bus_notify(struct notifier_block *nb,
-                                unsigned long action, void *data)
+static int clariion_bus_attach(struct scsi_device *sdev)
 {
-        struct device *dev = data;
-        struct scsi_device *sdev;
         struct scsi_dh_data *scsi_dh_data;
         struct clariion_dh_data *h;
-        int i, found = 0;
         unsigned long flags;
+        int err;
 
-        if (!scsi_is_sdev_device(dev))
-                return 0;
+        scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
+                               + sizeof(*h) , GFP_KERNEL);
+        if (!scsi_dh_data) {
+                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
+                            CLARIION_NAME);
+                return -ENOMEM;
+        }
 
-        sdev = to_scsi_device(dev);
+        scsi_dh_data->scsi_dh = &clariion_dh;
+        h = (struct clariion_dh_data *) scsi_dh_data->buf;
+        h->lun_state = CLARIION_LUN_UNINITIALIZED;
+        h->default_sp = CLARIION_UNBOUND_LU;
+        h->current_sp = CLARIION_UNBOUND_LU;
 
-        if (action == BUS_NOTIFY_ADD_DEVICE) {
-                for (i = 0; clariion_dev_list[i].vendor; i++) {
-                        if (!strncmp(sdev->vendor, clariion_dev_list[i].vendor,
-                                     strlen(clariion_dev_list[i].vendor)) &&
-                            !strncmp(sdev->model, clariion_dev_list[i].model,
-                                     strlen(clariion_dev_list[i].model))) {
-                                found = 1;
-                                break;
-                        }
-                }
-                if (!found)
-                        goto out;
-
-                scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
-                                + sizeof(*h) , GFP_KERNEL);
-                if (!scsi_dh_data) {
-                        sdev_printk(KERN_ERR, sdev, "Attach failed %s.\n",
-                                    CLARIION_NAME);
-                        goto out;
-                }
+        err = clariion_std_inquiry(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto failed;
 
-                scsi_dh_data->scsi_dh = &clariion_dh;
-                h = (struct clariion_dh_data *) scsi_dh_data->buf;
-                h->default_sp = CLARIION_UNBOUND_LU;
-                h->current_sp = CLARIION_UNBOUND_LU;
+        err = clariion_send_inquiry(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto failed;
 
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                sdev->scsi_dh_data = scsi_dh_data;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+        if (!try_module_get(THIS_MODULE))
+                goto failed;
 
-                sdev_printk(KERN_NOTICE, sdev, "Attached %s.\n", CLARIION_NAME);
-                try_module_get(THIS_MODULE);
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        sdev->scsi_dh_data = scsi_dh_data;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
 
-        } else if (action == BUS_NOTIFY_DEL_DEVICE) {
-                if (sdev->scsi_dh_data == NULL ||
-                                sdev->scsi_dh_data->scsi_dh != &clariion_dh)
-                        goto out;
+        sdev_printk(KERN_INFO, sdev,
+                    "%s: connected to SP %c Port %d (%s, default SP %c)\n",
+                    CLARIION_NAME, h->current_sp + 'A',
+                    h->port, lun_state[h->lun_state],
+                    h->default_sp + 'A');
 
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                scsi_dh_data = sdev->scsi_dh_data;
-                sdev->scsi_dh_data = NULL;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+        return 0;
 
-                sdev_printk(KERN_NOTICE, sdev, "Dettached %s.\n",
-                            CLARIION_NAME);
+failed:
+        kfree(scsi_dh_data);
+        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+                    CLARIION_NAME);
+        return -EINVAL;
+}
 
-                kfree(scsi_dh_data);
-                module_put(THIS_MODULE);
-        }
+static void clariion_bus_detach(struct scsi_device *sdev)
+{
+        struct scsi_dh_data *scsi_dh_data;
+        unsigned long flags;
 
-out:
-        return 0;
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        scsi_dh_data = sdev->scsi_dh_data;
+        sdev->scsi_dh_data = NULL;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+
+        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n",
+                    CLARIION_NAME);
+
+        kfree(scsi_dh_data);
+        module_put(THIS_MODULE);
 }
 
 static int __init clariion_init(void)
@@ -487,7 +660,8 @@ static int __init clariion_init(void)
 
         r = scsi_register_device_handler(&clariion_dh);
         if (r != 0)
-                printk(KERN_ERR "Failed to register scsi device handler.");
+                printk(KERN_ERR "%s: Failed to register scsi device handler.",
+                        CLARIION_NAME);
         return r;
 }
 
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index ae6be87d6a83..9c7a1f8ebb72 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -4,6 +4,7 @@
  *
  * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
  * Copyright (C) 2006 Mike Christie
+ * Copyright (C) 2008 Hannes Reinecke <hare@suse.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,13 +26,18 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dh.h>
 
-#define HP_SW_NAME      "hp_sw"
+#define HP_SW_NAME                      "hp_sw"
 
-#define HP_SW_TIMEOUT (60 * HZ)
-#define HP_SW_RETRIES 3
+#define HP_SW_TIMEOUT                   (60 * HZ)
+#define HP_SW_RETRIES                   3
+
+#define HP_SW_PATH_UNINITIALIZED        -1
+#define HP_SW_PATH_ACTIVE               0
+#define HP_SW_PATH_PASSIVE              1
 
 struct hp_sw_dh_data {
         unsigned char sense[SCSI_SENSE_BUFFERSIZE];
+        int path_state;
         int retries;
 };
 
@@ -42,51 +48,161 @@ static inline struct hp_sw_dh_data *get_hp_sw_data(struct scsi_device *sdev)
         return ((struct hp_sw_dh_data *) scsi_dh_data->buf);
 }
 
-static int hp_sw_done(struct scsi_device *sdev)
+/*
+ * tur_done - Handle TEST UNIT READY return status
+ * @sdev: sdev the command has been sent to
+ * @errors: blk error code
+ *
+ * Returns SCSI_DH_DEV_OFFLINED if the sdev is on the passive path
+ */
+static int tur_done(struct scsi_device *sdev, unsigned char *sense)
 {
-        struct hp_sw_dh_data *h = get_hp_sw_data(sdev);
         struct scsi_sense_hdr sshdr;
-        int rc;
-
-        sdev_printk(KERN_INFO, sdev, "hp_sw_done\n");
+        int ret;
 
-        rc = scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE, &sshdr);
-        if (!rc)
+        ret = scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, &sshdr);
+        if (!ret) {
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: sending tur failed, no sense available\n",
+                            HP_SW_NAME);
+                ret = SCSI_DH_IO;
                 goto done;
+        }
         switch (sshdr.sense_key) {
+        case UNIT_ATTENTION:
+                ret = SCSI_DH_IMM_RETRY;
+                break;
         case NOT_READY:
-                if ((sshdr.asc == 0x04) && (sshdr.ascq == 3)) {
-                        rc = SCSI_DH_RETRY;
-                        h->retries++;
+                if ((sshdr.asc == 0x04) && (sshdr.ascq == 2)) {
+                        /*
+                         * LUN not ready - Initialization command required
+                         *
+                         * This is the passive path
+                         */
+                        ret = SCSI_DH_DEV_OFFLINED;
                         break;
                 }
-                /* fall through */
+                /* Fallthrough */
         default:
-                h->retries++;
-                rc = SCSI_DH_IMM_RETRY;
+                sdev_printk(KERN_WARNING, sdev,
+                           "%s: sending tur failed, sense %x/%x/%x\n",
+                           HP_SW_NAME, sshdr.sense_key, sshdr.asc,
+                           sshdr.ascq);
+                break;
         }
 
 done:
-        if (rc == SCSI_DH_OK || rc == SCSI_DH_IO)
-                h->retries = 0;
-        else if (h->retries > HP_SW_RETRIES) {
-                h->retries = 0;
+        return ret;
+}
+
+/*
+ * hp_sw_tur - Send TEST UNIT READY
+ * @sdev: sdev command should be sent to
+ *
+ * Use the TEST UNIT READY command to determine
+ * the path state.
+ */
+static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
+{
+        struct request *req;
+        int ret;
+
+        req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO);
+        if (!req)
+                return SCSI_DH_RES_TEMP_UNAVAIL;
+
+        req->cmd_type = REQ_TYPE_BLOCK_PC;
+        req->cmd_flags |= REQ_FAILFAST;
+        req->cmd_len = COMMAND_SIZE(TEST_UNIT_READY);
+        memset(req->cmd, 0, MAX_COMMAND_SIZE);
+        req->cmd[0] = TEST_UNIT_READY;
+        req->timeout = HP_SW_TIMEOUT;
+        req->sense = h->sense;
+        memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        req->sense_len = 0;
+
+retry:
+        ret = blk_execute_rq(req->q, NULL, req, 1);
+        if (ret == -EIO) {
+                if (req->sense_len > 0) {
+                        ret = tur_done(sdev, h->sense);
+                } else {
+                        sdev_printk(KERN_WARNING, sdev,
+                                    "%s: sending tur failed with %x\n",
+                                    HP_SW_NAME, req->errors);
+                        ret = SCSI_DH_IO;
+                }
+        } else {
+                h->path_state = HP_SW_PATH_ACTIVE;
+                ret = SCSI_DH_OK;
+        }
+        if (ret == SCSI_DH_IMM_RETRY)
+                goto retry;
+        if (ret == SCSI_DH_DEV_OFFLINED) {
+                h->path_state = HP_SW_PATH_PASSIVE;
+                ret = SCSI_DH_OK;
+        }
+
+        blk_put_request(req);
+
+        return ret;
+}
+
+/*
+ * start_done - Handle START STOP UNIT return status
+ * @sdev: sdev the command has been sent to
+ * @errors: blk error code
+ */
+static int start_done(struct scsi_device *sdev, unsigned char *sense)
+{
+        struct scsi_sense_hdr sshdr;
+        int rc;
+
+        rc = scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, &sshdr);
+        if (!rc) {
+                sdev_printk(KERN_WARNING, sdev,
+                            "%s: sending start_stop_unit failed, "
+                            "no sense available\n",
+                            HP_SW_NAME);
+                return SCSI_DH_IO;
+        }
+        switch (sshdr.sense_key) {
+        case NOT_READY:
+                if ((sshdr.asc == 0x04) && (sshdr.ascq == 3)) {
+                        /*
+                         * LUN not ready - manual intervention required
+                         *
+                         * Switch-over in progress, retry.
+                         */
+                        rc = SCSI_DH_RETRY;
+                        break;
+                }
+                /* fall through */
+        default:
+                sdev_printk(KERN_WARNING, sdev,
+                           "%s: sending start_stop_unit failed, sense %x/%x/%x\n",
+                           HP_SW_NAME, sshdr.sense_key, sshdr.asc,
+                           sshdr.ascq);
                 rc = SCSI_DH_IO;
         }
+
         return rc;
 }
 
-static int hp_sw_activate(struct scsi_device *sdev)
+/*
+ * hp_sw_start_stop - Send START STOP UNIT command
+ * @sdev: sdev command should be sent to
+ *
+ * Sending START STOP UNIT activates the SP.
+ */
+static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h)
 {
-        struct hp_sw_dh_data *h = get_hp_sw_data(sdev);
         struct request *req;
-        int ret = SCSI_DH_RES_TEMP_UNAVAIL;
+        int ret, retry;
 
-        req = blk_get_request(sdev->request_queue, WRITE, GFP_ATOMIC);
+        req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO);
         if (!req)
-                goto done;
-
-        sdev_printk(KERN_INFO, sdev, "sending START_STOP.");
+                return SCSI_DH_RES_TEMP_UNAVAIL;
 
         req->cmd_type = REQ_TYPE_BLOCK_PC;
         req->cmd_flags |= REQ_FAILFAST;
@@ -98,95 +214,153 @@ static int hp_sw_activate(struct scsi_device *sdev)
         req->sense = h->sense;
         memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);
         req->sense_len = 0;
+        retry = h->retries;
 
+retry:
         ret = blk_execute_rq(req->q, NULL, req, 1);
-        if (!ret) /* SUCCESS */
-                ret = hp_sw_done(sdev);
-        else
+        if (ret == -EIO) {
+                if (req->sense_len > 0) {
+                        ret = start_done(sdev, h->sense);
+                } else {
+                        sdev_printk(KERN_WARNING, sdev,
+                                    "%s: sending start_stop_unit failed with %x\n",
+                                    HP_SW_NAME, req->errors);
+                        ret = SCSI_DH_IO;
+                }
+        } else
+                ret = SCSI_DH_OK;
+
+        if (ret == SCSI_DH_RETRY) {
+                if (--retry)
+                        goto retry;
                 ret = SCSI_DH_IO;
-done:
+        }
+
+        blk_put_request(req);
+
+        return ret;
+}
+
+static int hp_sw_prep_fn(struct scsi_device *sdev, struct request *req)
+{
+        struct hp_sw_dh_data *h = get_hp_sw_data(sdev);
+        int ret = BLKPREP_OK;
+
+        if (h->path_state != HP_SW_PATH_ACTIVE) {
+                ret = BLKPREP_KILL;
+                req->cmd_flags |= REQ_QUIET;
+        }
+        return ret;
+
+}
+
+/*
+ * hp_sw_activate - Activate a path
+ * @sdev: sdev on the path to be activated
+ *
+ * The HP Active/Passive firmware is pretty simple;
+ * the passive path reports NOT READY with sense codes
+ * 0x04/0x02; a START STOP UNIT command will then
+ * activate the passive path (and deactivate the
+ * previously active one).
+ */
+static int hp_sw_activate(struct scsi_device *sdev)
+{
+        int ret = SCSI_DH_OK;
+        struct hp_sw_dh_data *h = get_hp_sw_data(sdev);
+
+        ret = hp_sw_tur(sdev, h);
+
+        if (ret == SCSI_DH_OK && h->path_state == HP_SW_PATH_PASSIVE) {
+                ret = hp_sw_start_stop(sdev, h);
+                if (ret == SCSI_DH_OK)
+                        sdev_printk(KERN_INFO, sdev,
+                                    "%s: activated path\n",
+                                    HP_SW_NAME);
+        }
+
         return ret;
 }
 
-static const struct {
-        char *vendor;
-        char *model;
-} hp_sw_dh_data_list[] = {
-        {"COMPAQ", "MSA"},
-        {"HP", "HSV"},
+const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
+        {"COMPAQ", "MSA1000 VOLUME"},
+        {"COMPAQ", "HSV110"},
+        {"HP", "HSV100"},
         {"DEC", "HSG80"},
         {NULL, NULL},
 };
 
-static int hp_sw_bus_notify(struct notifier_block *, unsigned long, void *);
+static int hp_sw_bus_attach(struct scsi_device *sdev);
+static void hp_sw_bus_detach(struct scsi_device *sdev);
 
 static struct scsi_device_handler hp_sw_dh = {
         .name           = HP_SW_NAME,
         .module         = THIS_MODULE,
-        .nb.notifier_call = hp_sw_bus_notify,
+        .devlist        = hp_sw_dh_data_list,
+        .attach         = hp_sw_bus_attach,
+        .detach         = hp_sw_bus_detach,
         .activate       = hp_sw_activate,
+        .prep_fn        = hp_sw_prep_fn,
 };
 
-static int hp_sw_bus_notify(struct notifier_block *nb,
-                            unsigned long action, void *data)
+static int hp_sw_bus_attach(struct scsi_device *sdev)
 {
-        struct device *dev = data;
-        struct scsi_device *sdev;
         struct scsi_dh_data *scsi_dh_data;
-        int i, found = 0;
+        struct hp_sw_dh_data *h;
         unsigned long flags;
+        int ret;
 
-        if (!scsi_is_sdev_device(dev))
+        scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
+                               + sizeof(struct hp_sw_dh_data) , GFP_KERNEL);
+        if (!scsi_dh_data) {
+                sdev_printk(KERN_ERR, sdev, "%s: Attach Failed\n",
+                            HP_SW_NAME);
                 return 0;
+        }
 
-        sdev = to_scsi_device(dev);
-
-        if (action == BUS_NOTIFY_ADD_DEVICE) {
-                for (i = 0; hp_sw_dh_data_list[i].vendor; i++) {
-                        if (!strncmp(sdev->vendor, hp_sw_dh_data_list[i].vendor,
-                                     strlen(hp_sw_dh_data_list[i].vendor)) &&
-                            !strncmp(sdev->model, hp_sw_dh_data_list[i].model,
-                                     strlen(hp_sw_dh_data_list[i].model))) {
-                                found = 1;
-                                break;
-                        }
-                }
-                if (!found)
-                        goto out;
+        scsi_dh_data->scsi_dh = &hp_sw_dh;
+        h = (struct hp_sw_dh_data *) scsi_dh_data->buf;
+        h->path_state = HP_SW_PATH_UNINITIALIZED;
+        h->retries = HP_SW_RETRIES;
 
-                scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
-                                + sizeof(struct hp_sw_dh_data) , GFP_KERNEL);
-                if (!scsi_dh_data) {
-                        sdev_printk(KERN_ERR, sdev, "Attach Failed %s.\n",
-                                    HP_SW_NAME);
-                        goto out;
-                }
+        ret = hp_sw_tur(sdev, h);
+        if (ret != SCSI_DH_OK || h->path_state == HP_SW_PATH_UNINITIALIZED)
+                goto failed;
 
-                scsi_dh_data->scsi_dh = &hp_sw_dh;
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                sdev->scsi_dh_data = scsi_dh_data;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-                try_module_get(THIS_MODULE);
+        if (!try_module_get(THIS_MODULE))
+                goto failed;
 
-                sdev_printk(KERN_NOTICE, sdev, "Attached %s.\n", HP_SW_NAME);
-        } else if (action == BUS_NOTIFY_DEL_DEVICE) {
-                if (sdev->scsi_dh_data == NULL ||
-                                sdev->scsi_dh_data->scsi_dh != &hp_sw_dh)
-                        goto out;
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        sdev->scsi_dh_data = scsi_dh_data;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
 
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                scsi_dh_data = sdev->scsi_dh_data;
-                sdev->scsi_dh_data = NULL;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-                module_put(THIS_MODULE);
+        sdev_printk(KERN_INFO, sdev, "%s: attached to %s path\n",
+                    HP_SW_NAME, h->path_state == HP_SW_PATH_ACTIVE?
+                    "active":"passive");
 
-                sdev_printk(KERN_NOTICE, sdev, "Dettached %s.\n", HP_SW_NAME);
+        return 0;
 
-                kfree(scsi_dh_data);
-        }
+failed:
+        kfree(scsi_dh_data);
+        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+                    HP_SW_NAME);
+        return -EINVAL;
+}
 
-out:
-        return 0;
+static void hp_sw_bus_detach( struct scsi_device *sdev )
+{
+        struct scsi_dh_data *scsi_dh_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        scsi_dh_data = sdev->scsi_dh_data;
+        sdev->scsi_dh_data = NULL;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+        module_put(THIS_MODULE);
+
+        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", HP_SW_NAME);
+
+        kfree(scsi_dh_data);
 }
 
 static int __init hp_sw_init(void)
@@ -202,6 +376,6 @@ static void __exit hp_sw_exit(void)
 module_init(hp_sw_init);
 module_exit(hp_sw_exit);
 
-MODULE_DESCRIPTION("HP MSA 1000");
+MODULE_DESCRIPTION("HP Active/Passive driver");
 MODULE_AUTHOR("Mike Christie <michaelc@cs.wisc.edu");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index fdf34b0ec6e1..b093a501f8ae 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -173,6 +173,11 @@ struct rdac_dh_data {
 #define RDAC_STATE_ACTIVE       0
 #define RDAC_STATE_PASSIVE      1
         unsigned char           state;
+
+#define RDAC_LUN_UNOWNED        0
+#define RDAC_LUN_OWNED          1
+#define RDAC_LUN_AVT            2
+        char                    lun_state;
         unsigned char           sense[SCSI_SENSE_BUFFERSIZE];
         union                   {
                 struct c2_inquiry c2;
@@ -182,6 +187,13 @@ struct rdac_dh_data {
         } inq;
 };
 
+static const char *lun_state[] =
+{
+        "unowned",
+        "owned",
+        "owned (AVT mode)",
+};
+
 static LIST_HEAD(ctlr_list);
 static DEFINE_SPINLOCK(list_lock);
 
@@ -197,9 +209,8 @@ static struct request *get_rdac_req(struct scsi_device *sdev,
 {
         struct request *rq;
         struct request_queue *q = sdev->request_queue;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
-        rq = blk_get_request(q, rw, GFP_KERNEL);
+        rq = blk_get_request(q, rw, GFP_NOIO);
 
         if (!rq) {
                 sdev_printk(KERN_INFO, sdev,
@@ -207,17 +218,14 @@ static struct request *get_rdac_req(struct scsi_device *sdev,
                 return NULL;
         }
 
-        if (buflen && blk_rq_map_kern(q, rq, buffer, buflen, GFP_KERNEL)) {
+        if (buflen && blk_rq_map_kern(q, rq, buffer, buflen, GFP_NOIO)) {
                 blk_put_request(rq);
                 sdev_printk(KERN_INFO, sdev,
                                 "get_rdac_req: blk_rq_map_kern failed.\n");
                 return NULL;
         }
 
-        memset(&rq->cmd, 0, BLK_MAX_CDB);
-        rq->sense = h->sense;
-        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
-        rq->sense_len = 0;
+        memset(rq->cmd, 0, BLK_MAX_CDB);
 
         rq->cmd_type = REQ_TYPE_BLOCK_PC;
         rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
@@ -227,12 +235,12 @@ static struct request *get_rdac_req(struct scsi_device *sdev,
         return rq;
 }
 
-static struct request *rdac_failover_get(struct scsi_device *sdev)
+static struct request *rdac_failover_get(struct scsi_device *sdev,
+                                         struct rdac_dh_data *h)
 {
         struct request *rq;
         struct rdac_mode_common *common;
         unsigned data_size;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
         if (h->ctlr->use_ms10) {
                 struct rdac_pg_expanded *rdac_pg;
@@ -277,6 +285,10 @@ static struct request *rdac_failover_get(struct scsi_device *sdev)
         }
         rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);
 
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = 0;
+
         return rq;
 }
 
@@ -321,11 +333,10 @@ done:
 }
 
 static int submit_inquiry(struct scsi_device *sdev, int page_code,
-                unsigned int len)
+                          unsigned int len, struct rdac_dh_data *h)
 {
         struct request *rq;
         struct request_queue *q = sdev->request_queue;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
         int err = SCSI_DH_RES_TEMP_UNAVAIL;
 
         rq = get_rdac_req(sdev, &h->inq, len, READ);
@@ -338,59 +349,68 @@ static int submit_inquiry(struct scsi_device *sdev, int page_code,
         rq->cmd[2] = page_code;
         rq->cmd[4] = len;
         rq->cmd_len = COMMAND_SIZE(INQUIRY);
+
+        rq->sense = h->sense;
+        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        rq->sense_len = 0;
+
         err = blk_execute_rq(q, NULL, rq, 1);
         if (err == -EIO)
                 err = SCSI_DH_IO;
+
+        blk_put_request(rq);
 done:
         return err;
 }
 
-static int get_lun(struct scsi_device *sdev)
+static int get_lun(struct scsi_device *sdev, struct rdac_dh_data *h)
 {
         int err;
         struct c8_inquiry *inqp;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
-        err = submit_inquiry(sdev, 0xC8, sizeof(struct c8_inquiry));
+        err = submit_inquiry(sdev, 0xC8, sizeof(struct c8_inquiry), h);
         if (err == SCSI_DH_OK) {
                 inqp = &h->inq.c8;
-                h->lun = inqp->lun[7]; /* currently it uses only one byte */
+                if (inqp->page_code != 0xc8)
+                        return SCSI_DH_NOSYS;
+                if (inqp->page_id[0] != 'e' || inqp->page_id[1] != 'd' ||
+                    inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd')
+                        return SCSI_DH_NOSYS;
+                h->lun = scsilun_to_int((struct scsi_lun *)inqp->lun);
         }
         return err;
 }
 
-#define RDAC_OWNED      0
-#define RDAC_UNOWNED    1
-#define RDAC_FAILED     2
-static int check_ownership(struct scsi_device *sdev)
+static int check_ownership(struct scsi_device *sdev, struct rdac_dh_data *h)
 {
         int err;
         struct c9_inquiry *inqp;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
-        err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry));
+        err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry), h);
         if (err == SCSI_DH_OK) {
-                err = RDAC_UNOWNED;
                 inqp = &h->inq.c9;
-                /*
-                 * If in AVT mode or if the path already owns the LUN,
-                 * return RDAC_OWNED;
-                 */
-                if (((inqp->avte_cvp >> 7) == 0x1) ||
-                                 ((inqp->avte_cvp & 0x1) != 0))
-                        err = RDAC_OWNED;
-        } else
-                err = RDAC_FAILED;
+                if ((inqp->avte_cvp >> 7) == 0x1) {
+                        /* LUN in AVT mode */
+                        sdev_printk(KERN_NOTICE, sdev,
+                                    "%s: AVT mode detected\n",
+                                    RDAC_NAME);
+                        h->lun_state = RDAC_LUN_AVT;
+                } else if ((inqp->avte_cvp & 0x1) != 0) {
+                        /* LUN was owned by the controller */
+                        h->lun_state = RDAC_LUN_OWNED;
+                }
+        }
+
         return err;
 }
 
-static int initialize_controller(struct scsi_device *sdev)
+static int initialize_controller(struct scsi_device *sdev,
+                                 struct rdac_dh_data *h)
 {
         int err;
         struct c4_inquiry *inqp;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
-        err = submit_inquiry(sdev, 0xC4, sizeof(struct c4_inquiry));
+        err = submit_inquiry(sdev, 0xC4, sizeof(struct c4_inquiry), h);
         if (err == SCSI_DH_OK) {
                 inqp = &h->inq.c4;
                 h->ctlr = get_controller(inqp->subsys_id, inqp->slot_id);
@@ -400,13 +420,12 @@ static int initialize_controller(struct scsi_device *sdev)
         return err;
 }
 
-static int set_mode_select(struct scsi_device *sdev)
+static int set_mode_select(struct scsi_device *sdev, struct rdac_dh_data *h)
 {
         int err;
         struct c2_inquiry *inqp;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
 
-        err = submit_inquiry(sdev, 0xC2, sizeof(struct c2_inquiry));
+        err = submit_inquiry(sdev, 0xC2, sizeof(struct c2_inquiry), h);
         if (err == SCSI_DH_OK) {
                 inqp = &h->inq.c2;
                 /*
@@ -421,13 +440,13 @@ static int set_mode_select(struct scsi_device *sdev)
         return err;
 }
 
-static int mode_select_handle_sense(struct scsi_device *sdev)
+static int mode_select_handle_sense(struct scsi_device *sdev,
+                                    unsigned char *sensebuf)
 {
         struct scsi_sense_hdr sense_hdr;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
         int sense, err = SCSI_DH_IO, ret;
 
-        ret = scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE, &sense_hdr);
+        ret = scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE, &sense_hdr);
         if (!ret)
                 goto done;
 
@@ -451,14 +470,13 @@ done:
         return err;
 }
 
-static int send_mode_select(struct scsi_device *sdev)
+static int send_mode_select(struct scsi_device *sdev, struct rdac_dh_data *h)
 {
         struct request *rq;
         struct request_queue *q = sdev->request_queue;
-        struct rdac_dh_data *h = get_rdac_data(sdev);
         int err = SCSI_DH_RES_TEMP_UNAVAIL;
 
-        rq = rdac_failover_get(sdev);
+        rq = rdac_failover_get(sdev, h);
         if (!rq)
                 goto done;
 
@@ -466,9 +484,11 @@ static int send_mode_select(struct scsi_device *sdev)
 
         err = blk_execute_rq(q, NULL, rq, 1);
         if (err != SCSI_DH_OK)
-                err = mode_select_handle_sense(sdev);
+                err = mode_select_handle_sense(sdev, h->sense);
         if (err == SCSI_DH_OK)
                 h->state = RDAC_STATE_ACTIVE;
+
+        blk_put_request(rq);
 done:
         return err;
 }
@@ -478,38 +498,23 @@ static int rdac_activate(struct scsi_device *sdev)
         struct rdac_dh_data *h = get_rdac_data(sdev);
         int err = SCSI_DH_OK;
 
-        if (h->lun == UNINITIALIZED_LUN) {
-                err = get_lun(sdev);
-                if (err != SCSI_DH_OK)
-                        goto done;
-        }
-
-        err = check_ownership(sdev);
-        switch (err) {
-        case RDAC_UNOWNED:
-                break;
-        case RDAC_OWNED:
-                err = SCSI_DH_OK;
-                goto done;
-        case RDAC_FAILED:
-        default:
-                err = SCSI_DH_IO;
+        err = check_ownership(sdev, h);
+        if (err != SCSI_DH_OK)
                 goto done;
-        }
 
         if (!h->ctlr) {
-                err = initialize_controller(sdev);
+                err = initialize_controller(sdev, h);
                 if (err != SCSI_DH_OK)
                         goto done;
         }
 
         if (h->ctlr->use_ms10 == -1) {
-                err = set_mode_select(sdev);
+                err = set_mode_select(sdev, h);
                 if (err != SCSI_DH_OK)
                         goto done;
         }
-
-        err = send_mode_select(sdev);
+        if (h->lun_state == RDAC_LUN_UNOWNED)
+                err = send_mode_select(sdev, h);
 done:
         return err;
 }
@@ -569,10 +574,7 @@ static int rdac_check_sense(struct scsi_device *sdev,
         return SCSI_RETURN_NOT_HANDLED;
 }
 
-static const struct {
-        char *vendor;
-        char *model;
-} rdac_dev_list[] = {
+const struct scsi_dh_devlist rdac_dev_list[] = {
         {"IBM", "1722"},
         {"IBM", "1724"},
         {"IBM", "1726"},
@@ -590,89 +592,89 @@ static const struct {
         {NULL, NULL},
 };
 
-static int rdac_bus_notify(struct notifier_block *, unsigned long, void *);
+static int rdac_bus_attach(struct scsi_device *sdev);
+static void rdac_bus_detach(struct scsi_device *sdev);
 
 static struct scsi_device_handler rdac_dh = {
         .name = RDAC_NAME,
         .module = THIS_MODULE,
-        .nb.notifier_call = rdac_bus_notify,
+        .devlist = rdac_dev_list,
         .prep_fn = rdac_prep_fn,
         .check_sense = rdac_check_sense,
+        .attach = rdac_bus_attach,
+        .detach = rdac_bus_detach,
         .activate = rdac_activate,
 };
 
-/*
- * TODO: need some interface so we can set trespass values
- */
-static int rdac_bus_notify(struct notifier_block *nb,
-                            unsigned long action, void *data)
+static int rdac_bus_attach(struct scsi_device *sdev)
 {
-        struct device *dev = data;
-        struct scsi_device *sdev;
         struct scsi_dh_data *scsi_dh_data;
         struct rdac_dh_data *h;
-        int i, found = 0;
         unsigned long flags;
+        int err;
 
-        if (!scsi_is_sdev_device(dev))
+        scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
+                               + sizeof(*h) , GFP_KERNEL);
+        if (!scsi_dh_data) {
+                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
+                            RDAC_NAME);
                 return 0;
+        }
 
-        sdev = to_scsi_device(dev);
-
-        if (action == BUS_NOTIFY_ADD_DEVICE) {
-                for (i = 0; rdac_dev_list[i].vendor; i++) {
-                        if (!strncmp(sdev->vendor, rdac_dev_list[i].vendor,
-                                     strlen(rdac_dev_list[i].vendor)) &&
-                            !strncmp(sdev->model, rdac_dev_list[i].model,
-                                     strlen(rdac_dev_list[i].model))) {
-                                found = 1;
-                                break;
-                        }
-                }
-                if (!found)
-                        goto out;
+        scsi_dh_data->scsi_dh = &rdac_dh;
+        h = (struct rdac_dh_data *) scsi_dh_data->buf;
+        h->lun = UNINITIALIZED_LUN;
+        h->state = RDAC_STATE_ACTIVE;
 
-                scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
-                                + sizeof(*h) , GFP_KERNEL);
-                if (!scsi_dh_data) {
-                        sdev_printk(KERN_ERR, sdev, "Attach failed %s.\n",
-                                    RDAC_NAME);
-                        goto out;
-                }
+        err = get_lun(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto failed;
 
-                scsi_dh_data->scsi_dh = &rdac_dh;
-                h = (struct rdac_dh_data *) scsi_dh_data->buf;
-                h->lun = UNINITIALIZED_LUN;
-                h->state = RDAC_STATE_ACTIVE;
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                sdev->scsi_dh_data = scsi_dh_data;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-                try_module_get(THIS_MODULE);
-
-                sdev_printk(KERN_NOTICE, sdev, "Attached %s.\n", RDAC_NAME);
-
-        } else if (action == BUS_NOTIFY_DEL_DEVICE) {
-                if (sdev->scsi_dh_data == NULL ||
-                                sdev->scsi_dh_data->scsi_dh != &rdac_dh)
-                        goto out;
-
-                spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-                scsi_dh_data = sdev->scsi_dh_data;
-                sdev->scsi_dh_data = NULL;
-                spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-
-                h = (struct rdac_dh_data *) scsi_dh_data->buf;
-                if (h->ctlr)
-                        kref_put(&h->ctlr->kref, release_controller);
-                kfree(scsi_dh_data);
-                module_put(THIS_MODULE);
-                sdev_printk(KERN_NOTICE, sdev, "Dettached %s.\n", RDAC_NAME);
-        }
+        err = check_ownership(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto failed;
+
+        if (!try_module_get(THIS_MODULE))
+                goto failed;
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        sdev->scsi_dh_data = scsi_dh_data;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+
+        sdev_printk(KERN_NOTICE, sdev,
+                    "%s: LUN %d (%s)\n",
+                    RDAC_NAME, h->lun, lun_state[(int)h->lun_state]);
 
-out:
         return 0;
+
+failed:
+        kfree(scsi_dh_data);
+        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+                    RDAC_NAME);
+        return -EINVAL;
+}
+
+static void rdac_bus_detach( struct scsi_device *sdev )
+{
+        struct scsi_dh_data *scsi_dh_data;
+        struct rdac_dh_data *h;
+        unsigned long flags;
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
+        scsi_dh_data = sdev->scsi_dh_data;
+        sdev->scsi_dh_data = NULL;
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+
+        h = (struct rdac_dh_data *) scsi_dh_data->buf;
+        if (h->ctlr)
+                kref_put(&h->ctlr->kref, release_controller);
+        kfree(scsi_dh_data);
+        module_put(THIS_MODULE);
+        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", RDAC_NAME);
 }
 
+
+
 static int __init rdac_init(void)
 {
         int r;
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 61f8fdea2d96..ae560bc04f9d 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -521,9 +521,10 @@ static void ibmvfc_set_host_action(struct ibmvfc_host *vhost,
 static void ibmvfc_reinit_host(struct ibmvfc_host *vhost)
 {
         if (vhost->action == IBMVFC_HOST_ACTION_NONE) {
-                scsi_block_requests(vhost->host);
-                ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING);
-                ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY);
+                if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) {
+                        scsi_block_requests(vhost->host);
+                        ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY);
+                }
         } else
                 vhost->reinit = 1;
 
@@ -854,39 +855,41 @@ static void ibmvfc_retry_host_init(struct ibmvfc_host *vhost)
 }
 
 /**
- * __ibmvfc_find_target - Find the specified scsi_target (no locking)
+ * __ibmvfc_get_target - Find the specified scsi_target (no locking)
  * @starget:    scsi target struct
  *
  * Return value:
  *      ibmvfc_target struct / NULL if not found
  **/
-static struct ibmvfc_target *__ibmvfc_find_target(struct scsi_target *starget)
+static struct ibmvfc_target *__ibmvfc_get_target(struct scsi_target *starget)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         struct ibmvfc_host *vhost = shost_priv(shost);
         struct ibmvfc_target *tgt;
 
         list_for_each_entry(tgt, &vhost->targets, queue)
-                if (tgt->target_id == starget->id)
+                if (tgt->target_id == starget->id) {
+                        kref_get(&tgt->kref);
                         return tgt;
+                }
         return NULL;
 }
 
 /**
- * ibmvfc_find_target - Find the specified scsi_target
+ * ibmvfc_get_target - Find the specified scsi_target
  * @starget:    scsi target struct
  *
  * Return value:
  *      ibmvfc_target struct / NULL if not found
  **/
-static struct ibmvfc_target *ibmvfc_find_target(struct scsi_target *starget)
+static struct ibmvfc_target *ibmvfc_get_target(struct scsi_target *starget)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         struct ibmvfc_target *tgt;
         unsigned long flags;
 
         spin_lock_irqsave(shost->host_lock, flags);
-        tgt = __ibmvfc_find_target(starget);
+        tgt = __ibmvfc_get_target(starget);
         spin_unlock_irqrestore(shost->host_lock, flags);
         return tgt;
 }
@@ -963,6 +966,9 @@ static void ibmvfc_get_host_port_state(struct Scsi_Host *shost)
         case IBMVFC_HALTED:
                 fc_host_port_state(shost) = FC_PORTSTATE_BLOCKED;
                 break;
+        case IBMVFC_NO_CRQ:
+                fc_host_port_state(shost) = FC_PORTSTATE_UNKNOWN;
+                break;
         default:
                 ibmvfc_log(vhost, 3, "Unknown port state: %d\n", vhost->state);
                 fc_host_port_state(shost) = FC_PORTSTATE_UNKNOWN;
@@ -988,6 +994,17 @@ static void ibmvfc_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout)
 }
 
 /**
+ * ibmvfc_release_tgt - Free memory allocated for a target
+ * @kref:               kref struct
+ *
+ **/
+static void ibmvfc_release_tgt(struct kref *kref)
+{
+        struct ibmvfc_target *tgt = container_of(kref, struct ibmvfc_target, kref);
+        kfree(tgt);
+}
+
+/**
  * ibmvfc_get_starget_node_name - Get SCSI target's node name
  * @starget:    scsi target struct
  *
@@ -996,8 +1013,10 @@ static void ibmvfc_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout)
  **/
 static void ibmvfc_get_starget_node_name(struct scsi_target *starget)
 {
-        struct ibmvfc_target *tgt = ibmvfc_find_target(starget);
+        struct ibmvfc_target *tgt = ibmvfc_get_target(starget);
         fc_starget_port_name(starget) = tgt ? tgt->ids.node_name : 0;
+        if (tgt)
+                kref_put(&tgt->kref, ibmvfc_release_tgt);
 }
 
 /**
@@ -1009,8 +1028,10 @@ static void ibmvfc_get_starget_node_name(struct scsi_target *starget)
  **/
 static void ibmvfc_get_starget_port_name(struct scsi_target *starget)
 {
-        struct ibmvfc_target *tgt = ibmvfc_find_target(starget);
+        struct ibmvfc_target *tgt = ibmvfc_get_target(starget);
         fc_starget_port_name(starget) = tgt ? tgt->ids.port_name : 0;
+        if (tgt)
+                kref_put(&tgt->kref, ibmvfc_release_tgt);
 }
 
 /**
@@ -1022,8 +1043,10 @@ static void ibmvfc_get_starget_port_name(struct scsi_target *starget)
  **/
 static void ibmvfc_get_starget_port_id(struct scsi_target *starget)
 {
-        struct ibmvfc_target *tgt = ibmvfc_find_target(starget);
+        struct ibmvfc_target *tgt = ibmvfc_get_target(starget);
         fc_starget_port_id(starget) = tgt ? tgt->scsi_id : -1;
+        if (tgt)
+                kref_put(&tgt->kref, ibmvfc_release_tgt);
 }
 
 /**
@@ -1113,7 +1136,7 @@ static void ibmvfc_set_login_info(struct ibmvfc_host *vhost)
         login_info->max_cmds = max_requests + IBMVFC_NUM_INTERNAL_REQ;
         login_info->capabilities = IBMVFC_CAN_MIGRATE;
         login_info->async.va = vhost->async_crq.msg_token;
-        login_info->async.len = vhost->async_crq.size;
+        login_info->async.len = vhost->async_crq.size * sizeof(*vhost->async_crq.msgs);
         strncpy(login_info->partition_name, vhost->partition_name, IBMVFC_MAX_NAME);
         strncpy(login_info->device_name,
                 vhost->host->shost_gendev.bus_id, IBMVFC_MAX_NAME);
@@ -1404,7 +1427,7 @@ static void ibmvfc_log_error(struct ibmvfc_event *evt)
                 err = cmd_status[index].name;
         }
 
-        if (!logerr && (vhost->log_level <= IBMVFC_DEFAULT_LOG_LEVEL))
+        if (!logerr && (vhost->log_level <= (IBMVFC_DEFAULT_LOG_LEVEL + 1)))
                 return;
 
         if (rsp->flags & FCP_RSP_LEN_VALID)
@@ -2054,7 +2077,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
 {
         const char *desc = ibmvfc_get_ae_desc(crq->event);
 
-        ibmvfc_log(vhost, 2, "%s event received\n", desc);
+        ibmvfc_log(vhost, 3, "%s event received\n", desc);
 
         switch (crq->event) {
         case IBMVFC_AE_LINK_UP:
@@ -2648,17 +2671,6 @@ static void ibmvfc_retry_tgt_init(struct ibmvfc_target *tgt,
 }
 
 /**
- * ibmvfc_release_tgt - Free memory allocated for a target
- * @kref:               kref struct
- *
- **/
-static void ibmvfc_release_tgt(struct kref *kref)
-{
-        struct ibmvfc_target *tgt = container_of(kref, struct ibmvfc_target, kref);
-        kfree(tgt);
-}
-
-/**
  * ibmvfc_tgt_prli_done - Completion handler for Process Login
  * @evt:        ibmvfc event struct
  *
@@ -2902,6 +2914,139 @@ static void ibmvfc_tgt_implicit_logout(struct ibmvfc_target *tgt)
 }
 
 /**
+ * ibmvfc_adisc_needs_plogi - Does device need PLOGI?
+ * @mad:        ibmvfc passthru mad struct
+ * @tgt:        ibmvfc target struct
+ *
+ * Returns:
+ *      1 if PLOGI needed / 0 if PLOGI not needed
+ **/
+static int ibmvfc_adisc_needs_plogi(struct ibmvfc_passthru_mad *mad,
+                                    struct ibmvfc_target *tgt)
+{
+        if (memcmp(&mad->fc_iu.response[2], &tgt->ids.port_name,
+                   sizeof(tgt->ids.port_name)))
+                return 1;
+        if (memcmp(&mad->fc_iu.response[4], &tgt->ids.node_name,
+                   sizeof(tgt->ids.node_name)))
+                return 1;
+        if (mad->fc_iu.response[6] != tgt->scsi_id)
+                return 1;
+        return 0;
+}
+
+/**
+ * ibmvfc_tgt_adisc_done - Completion handler for ADISC
+ * @evt:        ibmvfc event struct
+ *
+ **/
+static void ibmvfc_tgt_adisc_done(struct ibmvfc_event *evt)
+{
+        struct ibmvfc_target *tgt = evt->tgt;
+        struct ibmvfc_host *vhost = evt->vhost;
+        struct ibmvfc_passthru_mad *mad = &evt->xfer_iu->passthru;
+        u32 status = mad->common.status;
+        u8 fc_reason, fc_explain;
+
+        vhost->discovery_threads--;
+        ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE);
+
+        switch (status) {
+        case IBMVFC_MAD_SUCCESS:
+                tgt_dbg(tgt, "ADISC succeeded\n");
+                if (ibmvfc_adisc_needs_plogi(mad, tgt))
+                        tgt->need_login = 1;
+                break;
+        case IBMVFC_MAD_DRIVER_FAILED:
+                break;
+        case IBMVFC_MAD_FAILED:
+        default:
+                tgt->need_login = 1;
+                fc_reason = (mad->fc_iu.response[1] & 0x00ff0000) >> 16;
+                fc_explain = (mad->fc_iu.response[1] & 0x0000ff00) >> 8;
+                tgt_info(tgt, "ADISC failed: %s (%x:%x) %s (%x) %s (%x) rc=0x%02X\n",
+                         ibmvfc_get_cmd_error(mad->iu.status, mad->iu.error),
+                         mad->iu.status, mad->iu.error,
+                         ibmvfc_get_fc_type(fc_reason), fc_reason,
+                         ibmvfc_get_ls_explain(fc_explain), fc_explain, status);
+                break;
+        };
+
+        kref_put(&tgt->kref, ibmvfc_release_tgt);
+        ibmvfc_free_event(evt);
+        wake_up(&vhost->work_wait_q);
+}
+
+/**
+ * ibmvfc_init_passthru - Initialize an event struct for FC passthru
+ * @evt:                ibmvfc event struct
+ *
+ **/
+static void ibmvfc_init_passthru(struct ibmvfc_event *evt)
+{
+        struct ibmvfc_passthru_mad *mad = &evt->iu.passthru;
+
+        memset(mad, 0, sizeof(*mad));
+        mad->common.version = 1;
+        mad->common.opcode = IBMVFC_PASSTHRU;
+        mad->common.length = sizeof(*mad) - sizeof(mad->fc_iu) - sizeof(mad->iu);
+        mad->cmd_ioba.va = (u64)evt->crq.ioba +
+                offsetof(struct ibmvfc_passthru_mad, iu);
+        mad->cmd_ioba.len = sizeof(mad->iu);
+        mad->iu.cmd_len = sizeof(mad->fc_iu.payload);
+        mad->iu.rsp_len = sizeof(mad->fc_iu.response);
+        mad->iu.cmd.va = (u64)evt->crq.ioba +
+                offsetof(struct ibmvfc_passthru_mad, fc_iu) +
+                offsetof(struct ibmvfc_passthru_fc_iu, payload);
+        mad->iu.cmd.len = sizeof(mad->fc_iu.payload);
+        mad->iu.rsp.va = (u64)evt->crq.ioba +
+                offsetof(struct ibmvfc_passthru_mad, fc_iu) +
+                offsetof(struct ibmvfc_passthru_fc_iu, response);
+        mad->iu.rsp.len = sizeof(mad->fc_iu.response);
+}
+
+/**
+ * ibmvfc_tgt_adisc - Initiate an ADISC for specified target
+ * @tgt:                ibmvfc target struct
+ *
+ **/
+static void ibmvfc_tgt_adisc(struct ibmvfc_target *tgt)
+{
+        struct ibmvfc_passthru_mad *mad;
+        struct ibmvfc_host *vhost = tgt->vhost;
+        struct ibmvfc_event *evt;
+
+        if (vhost->discovery_threads >= disc_threads)
+                return;
+
+        kref_get(&tgt->kref);
+        evt = ibmvfc_get_event(vhost);
+        vhost->discovery_threads++;
+        ibmvfc_init_event(evt, ibmvfc_tgt_adisc_done, IBMVFC_MAD_FORMAT);
+        evt->tgt = tgt;
+
+        ibmvfc_init_passthru(evt);
+        mad = &evt->iu.passthru;
+        mad->iu.flags = IBMVFC_FC_ELS;
+        mad->iu.scsi_id = tgt->scsi_id;
+
+        mad->fc_iu.payload[0] = IBMVFC_ADISC;
+        memcpy(&mad->fc_iu.payload[2], &vhost->login_buf->resp.port_name,
+               sizeof(vhost->login_buf->resp.port_name));
+        memcpy(&mad->fc_iu.payload[4], &vhost->login_buf->resp.node_name,
+               sizeof(vhost->login_buf->resp.node_name));
+        mad->fc_iu.payload[6] = vhost->login_buf->resp.scsi_id & 0x00ffffff;
+
+        ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT);
+        if (ibmvfc_send_event(evt, vhost, default_timeout)) {
+                vhost->discovery_threads--;
+                ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE);
+                kref_put(&tgt->kref, ibmvfc_release_tgt);
+        } else
+                tgt_dbg(tgt, "Sent ADISC\n");
+}
+
+/**
  * ibmvfc_tgt_query_target_done - Completion handler for Query Target MAD
  * @evt:        ibmvfc event struct
  *
@@ -2921,6 +3066,8 @@ static void ibmvfc_tgt_query_target_done(struct ibmvfc_event *evt)
                 tgt->new_scsi_id = rsp->scsi_id;
                 if (rsp->scsi_id != tgt->scsi_id)
                         ibmvfc_init_tgt(tgt, ibmvfc_tgt_implicit_logout);
+                else
+                        ibmvfc_init_tgt(tgt, ibmvfc_tgt_adisc);
                 break;
         case IBMVFC_MAD_DRIVER_FAILED:
                 break;
@@ -3336,6 +3483,7 @@ static void ibmvfc_tgt_add_rport(struct ibmvfc_target *tgt)
                 tgt_dbg(tgt, "rport add succeeded\n");
                 rport->maxframe_size = tgt->service_parms.common.bb_rcv_sz & 0x0fff;
                 rport->supported_classes = 0;
+                tgt->target_id = rport->scsi_target_id;
                 if (tgt->service_parms.class1_parms[0] & 0x80000000)
                         rport->supported_classes |= FC_COS_CLASS1;
                 if (tgt->service_parms.class2_parms[0] & 0x80000000)
@@ -3800,10 +3948,12 @@ static int ibmvfc_remove(struct vio_dev *vdev)
 
         ENTER;
         ibmvfc_remove_trace_file(&vhost->host->shost_dev.kobj, &ibmvfc_trace_attr);
+        ibmvfc_link_down(vhost, IBMVFC_HOST_OFFLINE);
+        ibmvfc_wait_while_resetting(vhost);
+        ibmvfc_release_crq_queue(vhost);
         kthread_stop(vhost->work_thread);
         fc_remove_host(vhost->host);
         scsi_remove_host(vhost->host);
-        ibmvfc_release_crq_queue(vhost);
 
         spin_lock_irqsave(vhost->host->host_lock, flags);
         ibmvfc_purge_requests(vhost, DID_ERROR);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 057f3c01ed61..4bf6e374f076 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -29,8 +29,8 @@
 #include "viosrp.h"
 
 #define IBMVFC_NAME     "ibmvfc"
-#define IBMVFC_DRIVER_VERSION           "1.0.0"
-#define IBMVFC_DRIVER_DATE              "(July 1, 2008)"
+#define IBMVFC_DRIVER_VERSION           "1.0.1"
+#define IBMVFC_DRIVER_DATE              "(July 11, 2008)"
 
 #define IBMVFC_DEFAULT_TIMEOUT  15
 #define IBMVFC_INIT_TIMEOUT             30
@@ -119,6 +119,7 @@ enum ibmvfc_mad_types {
         IBMVFC_PROCESS_LOGIN    = 0x0008,
         IBMVFC_QUERY_TARGET     = 0x0010,
         IBMVFC_IMPLICIT_LOGOUT  = 0x0040,
+        IBMVFC_PASSTHRU         = 0x0200,
         IBMVFC_TMF_MAD          = 0x0100,
 };
 
@@ -439,6 +440,37 @@ struct ibmvfc_cmd {
         struct ibmvfc_fcp_rsp rsp;
 }__attribute__((packed, aligned (8)));
 
+struct ibmvfc_passthru_fc_iu {
+        u32 payload[7];
+#define IBMVFC_ADISC    0x52000000
+        u32 response[7];
+};
+
+struct ibmvfc_passthru_iu {
+        u64 task_tag;
+        u32 cmd_len;
+        u32 rsp_len;
+        u16 status;
+        u16 error;
+        u32 flags;
+#define IBMVFC_FC_ELS           0x01
+        u32 cancel_key;
+        u32 reserved;
+        struct srp_direct_buf cmd;
+        struct srp_direct_buf rsp;
+        u64 correlation;
+        u64 scsi_id;
+        u64 tag;
+        u64 reserved2[2];
+}__attribute__((packed, aligned (8)));
+
+struct ibmvfc_passthru_mad {
+        struct ibmvfc_mad_common common;
+        struct srp_direct_buf cmd_ioba;
+        struct ibmvfc_passthru_iu iu;
+        struct ibmvfc_passthru_fc_iu fc_iu;
+}__attribute__((packed, aligned (8)));
+
 struct ibmvfc_trace_start_entry {
         u32 xfer_len;
 }__attribute__((packed));
@@ -531,6 +563,7 @@ union ibmvfc_iu {
         struct ibmvfc_implicit_logout implicit_logout;
         struct ibmvfc_tmf tmf;
         struct ibmvfc_cmd cmd;
+        struct ibmvfc_passthru_mad passthru;
 }__attribute__((packed, aligned (8)));
 
 enum ibmvfc_target_action {
@@ -656,6 +689,9 @@ struct ibmvfc_host {
 #define tgt_dbg(t, fmt, ...)                    \
         DBG_CMD(dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
 
+#define tgt_info(t, fmt, ...)           \
+        dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
+
 #define tgt_err(t, fmt, ...)            \
         dev_err((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
 
@@ -668,8 +704,8 @@ struct ibmvfc_host {
                         dev_err((vhost)->dev, ##__VA_ARGS__); \
         } while (0)
 
-#define ENTER DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Entering %s\n", __FUNCTION__))
-#define LEAVE DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Leaving %s\n", __FUNCTION__))
+#define ENTER DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Entering %s\n", __func__))
+#define LEAVE DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Leaving %s\n", __func__))
 
 #ifdef CONFIG_SCSI_IBMVFC_TRACE
 #define ibmvfc_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 2e13ec00172a..2a5b29d12172 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -55,7 +55,7 @@
 /* tmp - will replace with SCSI logging stuff */
 #define eprintk(fmt, args...)                                   \
 do {                                                            \
-        printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args);  \
+        printk("%s(%d) " fmt, __func__, __LINE__, ##args);      \
 } while (0)
 /* #define dprintk eprintk */
 #define dprintk(fmt, args...)
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index f97d172844be..c2a9a13d788f 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -163,7 +163,7 @@ static int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start,
 
 #if IMM_DEBUG > 0
 #define imm_fail(x,y) printk("imm: imm_fail(%i) from %s at line %d\n",\
-           y, __FUNCTION__, __LINE__); imm_fail_func(x,y);
+           y, __func__, __LINE__); imm_fail_func(x,y);
 static inline void
 imm_fail_func(imm_struct *dev, int error_code)
 #else
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index d93156671e93..4871dd1f2582 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1403,10 +1403,10 @@ struct ipr_ucode_image_header {
 }
 
 #define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\
-        __FILE__, __FUNCTION__, __LINE__)
+        __FILE__, __func__, __LINE__)
 
-#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__))
-#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__))
+#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __func__))
+#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __func__))
 
 #define ipr_err_separator \
 ipr_err("----------------------------------------------------------\n")
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 744f06d04a36..48ee8c7f5bdd 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -74,7 +74,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
                 case SAS_OPEN_TO:
                 case SAS_OPEN_REJECT:
                         SAS_DPRINTK("%s: Saw error %d.  What to do?\n",
-                                    __FUNCTION__, ts->stat);
+                                    __func__, ts->stat);
                         return AC_ERR_OTHER;
 
                 case SAS_ABORTED_TASK:
@@ -115,7 +115,7 @@ static void sas_ata_task_done(struct sas_task *task)
         } else if (stat->stat != SAM_STAT_GOOD) {
                 ac = sas_to_ata_err(stat);
                 if (ac) {
-                        SAS_DPRINTK("%s: SAS error %x\n", __FUNCTION__,
+                        SAS_DPRINTK("%s: SAS error %x\n", __func__,
                                     stat->stat);
                         /* We saw a SAS error. Send a vague error. */
                         qc->err_mask = ac;
@@ -244,20 +244,20 @@ static void sas_ata_phy_reset(struct ata_port *ap)
                 res = i->dft->lldd_I_T_nexus_reset(dev);
 
         if (res != TMF_RESP_FUNC_COMPLETE)
-                SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __FUNCTION__);
+                SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __func__);
 
         switch (dev->sata_dev.command_set) {
                 case ATA_COMMAND_SET:
-                        SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
+                        SAS_DPRINTK("%s: Found ATA device.\n", __func__);
                         ap->link.device[0].class = ATA_DEV_ATA;
                         break;
                 case ATAPI_COMMAND_SET:
-                        SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
+                        SAS_DPRINTK("%s: Found ATAPI device.\n", __func__);
                         ap->link.device[0].class = ATA_DEV_ATAPI;
                         break;
                 default:
                         SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
-                                    __FUNCTION__,
+                                    __func__,
                                     dev->sata_dev.command_set);
                         ap->link.device[0].class = ATA_DEV_UNKNOWN;
                         break;
@@ -299,7 +299,7 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
 {
         struct domain_device *dev = ap->private_data;
 
-        SAS_DPRINTK("STUB %s\n", __FUNCTION__);
+        SAS_DPRINTK("STUB %s\n", __func__);
         switch (sc_reg_in) {
                 case SCR_STATUS:
                         dev->sata_dev.sstatus = val;
@@ -324,7 +324,7 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
 {
         struct domain_device *dev = ap->private_data;
 
-        SAS_DPRINTK("STUB %s\n", __FUNCTION__);
+        SAS_DPRINTK("STUB %s\n", __func__);
         switch (sc_reg_in) {
                 case SCR_STATUS:
                         *val = dev->sata_dev.sstatus;
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index aefd865a5788..3da02e436788 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -121,7 +121,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
                         break;
                 } else {
                         SAS_DPRINTK("%s: task to dev %016llx response: 0x%x "
-                                    "status 0x%x\n", __FUNCTION__,
+                                    "status 0x%x\n", __func__,
                                     SAS_ADDR(dev->sas_addr),
                                     task->task_status.resp,
                                     task->task_status.stat);
@@ -1279,7 +1279,7 @@ static int sas_configure_present(struct domain_device *dev, int phy_id,
                         goto out;
                 } else if (res != SMP_RESP_FUNC_ACC) {
                         SAS_DPRINTK("%s: dev %016llx phy 0x%x index 0x%x "
-                                    "result 0x%x\n", __FUNCTION__,
+                                    "result 0x%x\n", __func__,
                                     SAS_ADDR(dev->sas_addr), phy_id, i, res);
                         goto out;
                 }
@@ -1901,7 +1901,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         if (!rsp) {
                 printk("%s: space for a smp response is missing\n",
-                       __FUNCTION__);
+                       __func__);
                 return -EINVAL;
         }
 
@@ -1914,20 +1914,20 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         if (type != SAS_EDGE_EXPANDER_DEVICE &&
             type != SAS_FANOUT_EXPANDER_DEVICE) {
                 printk("%s: can we send a smp request to a device?\n",
-                       __FUNCTION__);
+                       __func__);
                 return -EINVAL;
         }
 
         dev = sas_find_dev_by_rphy(rphy);
         if (!dev) {
-                printk("%s: fail to find a domain_device?\n", __FUNCTION__);
+                printk("%s: fail to find a domain_device?\n", __func__);
                 return -EINVAL;
         }
 
         /* do we need to support multiple segments? */
         if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
                 printk("%s: multiple segments req %u %u, rsp %u %u\n",
-                       __FUNCTION__, req->bio->bi_vcnt, req->data_len,
+                       __func__, req->bio->bi_vcnt, req->data_len,
                        rsp->bio->bi_vcnt, rsp->data_len);
                 return -EINVAL;
         }
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 39ae68a3b0ef..139935a121b4 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -50,7 +50,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
                         sas_deform_port(phy);
                 else {
                         SAS_DPRINTK("%s: phy%d belongs to port%d already(%d)!\n",
-                                    __FUNCTION__, phy->id, phy->port->id,
+                                    __func__, phy->id, phy->port->id,
                                     phy->port->num_phys);
                         return;
                 }
@@ -78,7 +78,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
 
         if (i >= sas_ha->num_phys) {
                 printk(KERN_NOTICE "%s: couldn't find a free port, bug?\n",
-                       __FUNCTION__);
+                       __func__);
                 spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
                 return;
         }
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 601ec5b6a7f6..a8e3ef309070 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -343,7 +343,7 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
                                                        flags);
                                 SAS_DPRINTK("%s: task 0x%p aborted from "
                                             "task_queue\n",
-                                            __FUNCTION__, task);
+                                            __func__, task);
                                 return TASK_IS_ABORTED;
                         }
                 }
@@ -351,13 +351,13 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
         }
 
         for (i = 0; i < 5; i++) {
-                SAS_DPRINTK("%s: aborting task 0x%p\n", __FUNCTION__, task);
+                SAS_DPRINTK("%s: aborting task 0x%p\n", __func__, task);
                 res = si->dft->lldd_abort_task(task);
 
                 spin_lock_irqsave(&task->task_state_lock, flags);
                 if (task->task_state_flags & SAS_TASK_STATE_DONE) {
                         spin_unlock_irqrestore(&task->task_state_lock, flags);
-                        SAS_DPRINTK("%s: task 0x%p is done\n", __FUNCTION__,
+                        SAS_DPRINTK("%s: task 0x%p is done\n", __func__,
                                     task);
                         return TASK_IS_DONE;
                 }
@@ -365,24 +365,24 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
 
                 if (res == TMF_RESP_FUNC_COMPLETE) {
                         SAS_DPRINTK("%s: task 0x%p is aborted\n",
-                                    __FUNCTION__, task);
+                                    __func__, task);
                         return TASK_IS_ABORTED;
                 } else if (si->dft->lldd_query_task) {
                         SAS_DPRINTK("%s: querying task 0x%p\n",
-                                    __FUNCTION__, task);
+                                    __func__, task);
                         res = si->dft->lldd_query_task(task);
                         switch (res) {
                         case TMF_RESP_FUNC_SUCC:
                                 SAS_DPRINTK("%s: task 0x%p at LU\n",
-                                            __FUNCTION__, task);
+                                            __func__, task);
                                 return TASK_IS_AT_LU;
                         case TMF_RESP_FUNC_COMPLETE:
                                 SAS_DPRINTK("%s: task 0x%p not at LU\n",
-                                            __FUNCTION__, task);
+                                            __func__, task);
                                 return TASK_IS_NOT_AT_LU;
                         case TMF_RESP_FUNC_FAILED:
                                 SAS_DPRINTK("%s: task 0x%p failed to abort\n",
-                                                __FUNCTION__, task);
+                                                __func__, task);
                                 return TASK_ABORT_FAILED;
                         }
 
@@ -545,7 +545,7 @@ Again:
 
                 if (need_reset) {
                         SAS_DPRINTK("%s: task 0x%p requests reset\n",
-                                    __FUNCTION__, task);
+                                    __func__, task);
                         goto reset;
                 }
 
@@ -556,13 +556,13 @@ Again:
 
                 switch (res) {
                 case TASK_IS_DONE:
-                        SAS_DPRINTK("%s: task 0x%p is done\n", __FUNCTION__,
+                        SAS_DPRINTK("%s: task 0x%p is done\n", __func__,
                                     task);
                         sas_eh_finish_cmd(cmd);
                         continue;
                 case TASK_IS_ABORTED:
                         SAS_DPRINTK("%s: task 0x%p is aborted\n",
-                                    __FUNCTION__, task);
+                                    __func__, task);
                         sas_eh_finish_cmd(cmd);
                         continue;
                 case TASK_IS_AT_LU:
@@ -633,7 +633,7 @@ Again:
         }
         return list_empty(work_q);
 clear_q:
-        SAS_DPRINTK("--- Exit %s -- clear_q\n", __FUNCTION__);
+        SAS_DPRINTK("--- Exit %s -- clear_q\n", __func__);
         list_for_each_entry_safe(cmd, n, work_q, eh_entry)
                 sas_eh_finish_cmd(cmd);
 
@@ -650,7 +650,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
         list_splice_init(&shost->eh_cmd_q, &eh_work_q);
         spin_unlock_irqrestore(shost->host_lock, flags);
 
-        SAS_DPRINTK("Enter %s\n", __FUNCTION__);
+        SAS_DPRINTK("Enter %s\n", __func__);
         /*
          * Deal with commands that still have SAS tasks (i.e. they didn't
          * complete via the normal sas_task completion mechanism)
@@ -669,7 +669,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
 
 out:
         scsi_eh_flush_done_q(&ha->eh_done_q);
-        SAS_DPRINTK("--- Exit %s\n", __FUNCTION__);
+        SAS_DPRINTK("--- Exit %s\n", __func__);
         return;
 }
 
@@ -990,7 +990,7 @@ int __sas_task_abort(struct sas_task *task)
         if (task->task_state_flags & SAS_TASK_STATE_ABORTED ||
             task->task_state_flags & SAS_TASK_STATE_DONE) {
                 spin_unlock_irqrestore(&task->task_state_lock, flags);
-                SAS_DPRINTK("%s: Task %p already finished.\n", __FUNCTION__,
+                SAS_DPRINTK("%s: Task %p already finished.\n", __func__,
                             task);
                 return 0;
         }
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 6d6a76e65a6c..15e2d132e8b9 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -39,7 +39,7 @@ enum srp_task_attributes {
 /* tmp - will replace with SCSI logging stuff */
 #define eprintk(fmt, args...)                                   \
 do {                                                            \
-        printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args);  \
+        printk("%s(%d) " fmt, __func__, __LINE__, ##args);      \
 } while (0)
 /* #define dprintk eprintk */
 #define dprintk(fmt, args...)
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 5b6e5395c8eb..d51a2a4b43eb 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2083,7 +2083,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                 if (iocbq_entry == NULL) {
                         printk(KERN_ERR "%s: only allocated %d iocbs of "
                                 "expected %d count. Unloading driver.\n",
-                                __FUNCTION__, i, LPFC_IOCB_LIST_CNT);
+                                __func__, i, LPFC_IOCB_LIST_CNT);
                         error = -ENOMEM;
                         goto out_free_iocbq;
                 }
@@ -2093,7 +2093,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                         kfree (iocbq_entry);
                         printk(KERN_ERR "%s: failed to allocate IOTAG. "
                                "Unloading driver.\n",
-                                __FUNCTION__);
+                                __func__);
                         error = -ENOMEM;
                         goto out_free_iocbq;
                 }
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index c94da4f2b8a6..1bcebbd3dfac 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -341,7 +341,7 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                 if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) {
                         printk(KERN_ERR "%s: Too many sg segments from "
                                "dma_map_sg.  Config %d, seg_cnt %d",
-                               __FUNCTION__, phba->cfg_sg_seg_cnt,
+                               __func__, phba->cfg_sg_seg_cnt,
                                lpfc_cmd->seg_cnt);
                         scsi_dma_unmap(scsi_cmnd);
                         return 1;
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index f40aa7b905f7..50fe07646738 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -219,7 +219,7 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
         case CMD_IOCB_LOGENTRY_CN:
         case CMD_IOCB_LOGENTRY_ASYNC_CN:
                 printk("%s - Unhandled SLI-3 Command x%x\n",
-                                __FUNCTION__, iocb_cmnd);
+                                __func__, iocb_cmnd);
                 type = LPFC_UNKNOWN_IOCB;
                 break;
         default:
@@ -1715,7 +1715,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                 rspiocbp = __lpfc_sli_get_iocbq(phba);
                 if (rspiocbp == NULL) {
                         printk(KERN_ERR "%s: out of buffers! Failing "
-                               "completion.\n", __FUNCTION__);
+                               "completion.\n", __func__);
                         break;
                 }
 
@@ -3793,7 +3793,7 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,
                 break;
         default:
                 printk(KERN_ERR "%s: Unknown context cmd type, value %d\n",
-                        __FUNCTION__, ctx_cmd);
+                        __func__, ctx_cmd);
                 break;
         }
 
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index f62ed468ada0..5ead1283a844 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -265,7 +265,7 @@ typedef struct {
 #define ASSERT(expression)                                              \
         if (!(expression)) {                                            \
         ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \
-                        #expression, __FILE__, __LINE__, __FUNCTION__); \
+                        #expression, __FILE__, __LINE__, __func__);     \
         }
 #else
 #define ASSERT(expression)
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 70a0f11f48b2..805bb61dde18 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -458,7 +458,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         if (adapter == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
-                "megaraid: out of memory, %s %d.\n", __FUNCTION__, __LINE__));
+                "megaraid: out of memory, %s %d.\n", __func__, __LINE__));
 
                 goto out_probe_one;
         }
@@ -1002,7 +1002,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
 
         if (!raid_dev->una_mbox64) {
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
                 return -1;
         }
@@ -1030,7 +1030,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
         if (!adapter->ibuf) {
 
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
 
                 goto out_free_common_mbox;
@@ -1052,7 +1052,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
 
         if (adapter->kscb_list == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
                 goto out_free_ibuf;
         }
@@ -1060,7 +1060,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
         // memory allocation for our command packets
         if (megaraid_mbox_setup_dma_pools(adapter) != 0) {
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
                 goto out_free_scb_list;
         }
@@ -2981,7 +2981,7 @@ megaraid_mbox_product_info(adapter_t *adapter)
 
         if (pinfo == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
 
                 return -1;
@@ -3508,7 +3508,7 @@ megaraid_cmm_register(adapter_t *adapter)
 
         if (adapter->uscb_list == NULL) {
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
                 return -1;
         }
@@ -3879,7 +3879,7 @@ megaraid_sysfs_alloc_resources(adapter_t *adapter)
                 !raid_dev->sysfs_buffer) {
 
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid: out of memory, %s %d\n", __func__,
                         __LINE__));
 
                 rval = -ENOMEM;
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index ac3b280c2a72..f680561d2c6f 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -929,7 +929,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
                         !adapter->pthru_dma_pool) {
 
                 con_log(CL_ANN, (KERN_WARNING
-                        "megaraid cmm: out of memory, %s %d\n", __FUNCTION__,
+                        "megaraid cmm: out of memory, %s %d\n", __func__,
                         __LINE__));
 
                 rval = (-ENOMEM);
@@ -957,7 +957,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
 
                         con_log(CL_ANN, (KERN_WARNING
                                 "megaraid cmm: out of memory, %s %d\n",
-                                        __FUNCTION__, __LINE__));
+                                        __func__, __LINE__));
 
                         rval = (-ENOMEM);
 
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 7fed35372150..edf9fdb3cb3c 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -299,9 +299,9 @@ static struct scsi_host_template nsp32_template = {
 #else
 # define NSP32_DEBUG_MASK             0xffffff
 # define nsp32_msg(type, args...) \
-        nsp32_message (__FUNCTION__, __LINE__, (type), args)
+        nsp32_message (__func__, __LINE__, (type), args)
 # define nsp32_dbg(mask, args...) \
-        nsp32_dmessage(__FUNCTION__, __LINE__, (mask), args)
+        nsp32_dmessage(__func__, __LINE__, (mask), args)
 #endif
 
 #define NSP32_DEBUG_QUEUECOMMAND        BIT(0)
diff --git a/drivers/scsi/nsp32_debug.c b/drivers/scsi/nsp32_debug.c
index ef3c59cbcff6..2fb3fb58858d 100644
--- a/drivers/scsi/nsp32_debug.c
+++ b/drivers/scsi/nsp32_debug.c
@@ -88,7 +88,7 @@ static void print_commandk (unsigned char *command)
         int i,s;
 //      printk(KERN_DEBUG);
         print_opcodek(command[0]);
-        /*printk(KERN_DEBUG "%s ", __FUNCTION__);*/
+        /*printk(KERN_DEBUG "%s ", __func__);*/
         if ((command[0] >> 5) == 6 ||
             (command[0] >> 5) == 7 ) {
                 s = 12; /* vender specific */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 5082ca3c6876..a221b6ef9fa9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -107,9 +107,9 @@ static nsp_hw_data nsp_data_base; /* attach <-> detect glue */
 #else
 # define NSP_DEBUG_MASK         0xffffff
 # define nsp_msg(type, args...) \
-        nsp_cs_message (__FUNCTION__, __LINE__, (type), args)
+        nsp_cs_message (__func__, __LINE__, (type), args)
 # define nsp_dbg(mask, args...) \
-        nsp_cs_dmessage(__FUNCTION__, __LINE__, (mask), args)
+        nsp_cs_dmessage(__func__, __LINE__, (mask), args)
 #endif
 
 #define NSP_DEBUG_QUEUECOMMAND          BIT(0)
diff --git a/drivers/scsi/pcmcia/nsp_debug.c b/drivers/scsi/pcmcia/nsp_debug.c
index 2f75fe6e35a7..3c6ef64fcbff 100644
--- a/drivers/scsi/pcmcia/nsp_debug.c
+++ b/drivers/scsi/pcmcia/nsp_debug.c
@@ -90,7 +90,7 @@ static void print_commandk (unsigned char *command)
         int i, s;
         printk(KERN_DEBUG);
         print_opcodek(command[0]);
-        /*printk(KERN_DEBUG "%s ", __FUNCTION__);*/
+        /*printk(KERN_DEBUG "%s ", __func__);*/
         if ((command[0] >> 5) == 6 ||
             (command[0] >> 5) == 7 ) {
                 s = 12; /* vender specific */
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index f655ae320b48..8aa0bd987e29 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -171,7 +171,7 @@ static int device_check(ppa_struct *dev);
 
 #if PPA_DEBUG > 0
 #define ppa_fail(x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\
-           y, __FUNCTION__, __LINE__); ppa_fail_func(x,y);
+           y, __func__, __LINE__); ppa_fail_func(x,y);
 static inline void ppa_fail_func(ppa_struct *dev, int error_code)
 #else
 static inline void ppa_fail(ppa_struct *dev, int error_code)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 3754ab87f89a..37f9ba0cd798 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1695,7 +1695,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
         risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen;
 
         dprintk(1, "%s: DMA RISC code (%i) words\n",
-                        __FUNCTION__, risc_code_size);
+                        __func__, risc_code_size);
 
         num = 0;
         while (risc_code_size > 0) {
@@ -1721,7 +1721,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
                 mb[7] = pci_dma_hi32(ha->request_dma) & 0xffff;
                 mb[6] = pci_dma_hi32(ha->request_dma) >> 16;
                 dprintk(2, "%s: op=%d  0x%p = 0x%4x,0x%4x,0x%4x,0x%4x\n",
-                                __FUNCTION__, mb[0],
+                                __func__, mb[0],
                                 (void *)(long)ha->request_dma,
                                 mb[6], mb[7], mb[2], mb[3]);
                 err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 |
@@ -1753,10 +1753,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
                         if (tbuf[i] != sp[i] && warn++ < 10) {
                                 printk(KERN_ERR "%s: FW compare error @ "
                                                 "byte(0x%x) loop#=%x\n",
-                                                __FUNCTION__, i, num);
+                                                __func__, i, num);
                                 printk(KERN_ERR "%s: FWbyte=%x  "
                                                 "FWfromChip=%x\n",
-                                                __FUNCTION__, sp[i], tbuf[i]);
+                                                __func__, sp[i], tbuf[i]);
                                 /*break; */
                         }
                 }
@@ -1781,7 +1781,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
         int err;
 
         dprintk(1, "%s: Verifying checksum of loaded RISC code.\n",
-                        __FUNCTION__);
+                        __func__);
 
         /* Verify checksum of loaded RISC code. */
         mb[0] = MBC_VERIFY_CHECKSUM;
@@ -1794,7 +1794,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
         }
 
         /* Start firmware execution. */
-        dprintk(1, "%s: start firmware running.\n", __FUNCTION__);
+        dprintk(1, "%s: start firmware running.\n", __func__);
         mb[0] = MBC_EXECUTE_FIRMWARE;
         mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
         err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 8dd88fc1244a..a319a20ed440 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -8,6 +8,7 @@
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
+#include <linux/delay.h>
 
 static int qla24xx_vport_disable(struct fc_vport *, bool);
 
@@ -20,18 +21,12 @@ qla2x00_sysfs_read_fw_dump(struct kobject *kobj,
 {
         struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        char *rbuf = (char *)ha->fw_dump;
 
         if (ha->fw_dump_reading == 0)
                 return 0;
-        if (off > ha->fw_dump_len)
-                return 0;
-        if (off + count > ha->fw_dump_len)
-                count = ha->fw_dump_len - off;
 
-        memcpy(buf, &rbuf[off], count);
-
-        return (count);
+        return memory_read_from_buffer(buf, count, &off, ha->fw_dump,
+                                        ha->fw_dump_len);
 }
 
 static ssize_t
@@ -94,20 +89,13 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj,
 {
         struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        int             size = ha->nvram_size;
-        char            *nvram_cache = ha->nvram;
 
-        if (!capable(CAP_SYS_ADMIN) || off > size || count == 0)
+        if (!capable(CAP_SYS_ADMIN))
                 return 0;
-        if (off + count > size) {
-                size -= off;
-                count = size;
-        }
 
         /* Read NVRAM data from cache. */
-        memcpy(buf, &nvram_cache[off], count);
-
-        return count;
+        return memory_read_from_buffer(buf, count, &off, ha->nvram,
+                                        ha->nvram_size);
 }
 
 static ssize_t
@@ -175,14 +163,9 @@ qla2x00_sysfs_read_optrom(struct kobject *kobj,
 
         if (ha->optrom_state != QLA_SREADING)
                 return 0;
-        if (off > ha->optrom_region_size)
-                return 0;
-        if (off + count > ha->optrom_region_size)
-                count = ha->optrom_region_size - off;
-
-        memcpy(buf, &ha->optrom_buffer[off], count);
 
-        return count;
+        return memory_read_from_buffer(buf, count, &off, ha->optrom_buffer,
+                                        ha->optrom_region_size);
 }
 
 static ssize_t
@@ -374,20 +357,12 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,
 {
         struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        int           size = ha->vpd_size;
-        char          *vpd_cache = ha->vpd;
 
-        if (!capable(CAP_SYS_ADMIN) || off > size || count == 0)
+        if (!capable(CAP_SYS_ADMIN))
                 return 0;
-        if (off + count > size) {
-                size -= off;
-                count = size;
-        }
 
         /* Read NVRAM data from cache. */
-        memcpy(buf, &vpd_cache[off], count);
-
-        return count;
+        return memory_read_from_buffer(buf, count, &off, ha->vpd, ha->vpd_size);
 }
 
 static ssize_t
@@ -557,8 +532,10 @@ qla2x00_serial_num_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *ha = shost_priv(class_to_shost(dev));
         uint32_t sn;
 
-        if (IS_FWI2_CAPABLE(ha))
-                return snprintf(buf, PAGE_SIZE, "\n");
+        if (IS_FWI2_CAPABLE(ha)) {
+                qla2xxx_get_vpd_field(ha, "SN", buf, PAGE_SIZE);
+                return snprintf(buf, PAGE_SIZE, "%s\n", buf);
+        }
 
         sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
         return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,
@@ -809,6 +786,16 @@ qla2x00_optrom_fw_version_show(struct device *dev,
             ha->fw_revision[3]);
 }
 
+static ssize_t
+qla2x00_total_isp_aborts_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(dev));
+
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+            ha->qla_stats.total_isp_aborts);
+}
+
 static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL);
 static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
 static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
@@ -831,6 +818,8 @@ static DEVICE_ATTR(optrom_fcode_version, S_IRUGO,
                    qla2x00_optrom_fcode_version_show, NULL);
 static DEVICE_ATTR(optrom_fw_version, S_IRUGO, qla2x00_optrom_fw_version_show,
                    NULL);
+static DEVICE_ATTR(total_isp_aborts, S_IRUGO, qla2x00_total_isp_aborts_show,
+                   NULL);
 
 struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_driver_version,
@@ -849,6 +838,7 @@ struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_optrom_efi_version,
         &dev_attr_optrom_fcode_version,
         &dev_attr_optrom_fw_version,
+        &dev_attr_total_isp_aborts,
         NULL,
 };
 
@@ -972,26 +962,39 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)
 }
 
 static void
-qla2x00_get_rport_loss_tmo(struct fc_rport *rport)
+qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
 {
-        struct Scsi_Host *host = rport_to_shost(rport);
-        scsi_qla_host_t *ha = shost_priv(host);
-
-        rport->dev_loss_tmo = ha->port_down_retry_count + 5;
+        if (timeout)
+                rport->dev_loss_tmo = timeout;
+        else
+                rport->dev_loss_tmo = 1;
 }
 
 static void
-qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
+qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
 {
         struct Scsi_Host *host = rport_to_shost(rport);
-        scsi_qla_host_t *ha = shost_priv(host);
+        fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
+
+        qla2x00_abort_fcport_cmds(fcport);
+
+        /*
+         * Transport has effectively 'deleted' the rport, clear
+         * all local references.
+         */
+        spin_lock_irq(host->host_lock);
+        fcport->rport = NULL;
+        *((fc_port_t **)rport->dd_data) = NULL;
+        spin_unlock_irq(host->host_lock);
+}
 
-        if (timeout)
-                ha->port_down_retry_count = timeout;
-        else
-                ha->port_down_retry_count = 1;
+static void
+qla2x00_terminate_rport_io(struct fc_rport *rport)
+{
+        fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
 
-        rport->dev_loss_tmo = ha->port_down_retry_count + 5;
+        qla2x00_abort_fcport_cmds(fcport);
+        scsi_target_unblock(&rport->dev);
 }
 
 static int
@@ -1045,6 +1048,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         pfc_host_stat->invalid_tx_word_count = stats->inval_xmit_word_cnt;
         pfc_host_stat->invalid_crc_count = stats->inval_crc_cnt;
         if (IS_FWI2_CAPABLE(ha)) {
+                pfc_host_stat->lip_count = stats->lip_cnt;
                 pfc_host_stat->tx_frames = stats->tx_frames;
                 pfc_host_stat->rx_frames = stats->rx_frames;
                 pfc_host_stat->dumped_frames = stats->dumped_frames;
@@ -1173,17 +1177,16 @@ vport_create_failed_2:
 static int
 qla24xx_vport_delete(struct fc_vport *fc_vport)
 {
-        scsi_qla_host_t *ha = shost_priv(fc_vport->shost);
         scsi_qla_host_t *vha = fc_vport->dd_data;
+        scsi_qla_host_t *pha = to_qla_parent(vha);
+
+        while (test_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags) ||
+            test_bit(FCPORT_UPDATE_NEEDED, &pha->dpc_flags))
+                msleep(1000);
 
         qla24xx_disable_vp(vha);
         qla24xx_deallocate_vp_id(vha);
 
-        mutex_lock(&ha->vport_lock);
-        ha->cur_vport_count--;
-        clear_bit(vha->vp_idx, ha->vp_idx_map);
-        mutex_unlock(&ha->vport_lock);
-
         kfree(vha->node_name);
         kfree(vha->port_name);
 
@@ -1248,11 +1251,12 @@ struct fc_function_template qla2xxx_transport_functions = {
         .get_starget_port_id  = qla2x00_get_starget_port_id,
         .show_starget_port_id = 1,
 
-        .get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,
         .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,
         .show_rport_dev_loss_tmo = 1,
 
         .issue_fc_host_lip = qla2x00_issue_lip,
+        .dev_loss_tmo_callbk = qla2x00_dev_loss_tmo_callbk,
+        .terminate_rport_io = qla2x00_terminate_rport_io,
         .get_fc_host_stats = qla2x00_get_fc_host_stats,
 
         .vport_create = qla24xx_vport_create,
@@ -1291,11 +1295,12 @@ struct fc_function_template qla2xxx_transport_vport_functions = {
         .get_starget_port_id  = qla2x00_get_starget_port_id,
         .show_starget_port_id = 1,
 
-        .get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,
         .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,
         .show_rport_dev_loss_tmo = 1,
 
         .issue_fc_host_lip = qla2x00_issue_lip,
+        .dev_loss_tmo_callbk = qla2x00_dev_loss_tmo_callbk,
+        .terminate_rport_io = qla2x00_terminate_rport_io,
         .get_fc_host_stats = qla2x00_get_fc_host_stats,
 };
 
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index cbef785765cf..510ba64bc286 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -216,7 +216,7 @@ qla24xx_soft_reset(scsi_qla_host_t *ha)
 
 static int
 qla2xxx_dump_ram(scsi_qla_host_t *ha, uint32_t addr, uint16_t *ram,
-    uint16_t ram_words, void **nxt)
+    uint32_t ram_words, void **nxt)
 {
         int rval;
         uint32_t cnt, stat, timer, words, idx;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 8dd600013bd1..6da31ba94404 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -864,7 +864,8 @@ struct link_statistics {
         uint32_t prim_seq_err_cnt;
         uint32_t inval_xmit_word_cnt;
         uint32_t inval_crc_cnt;
-        uint32_t unused1[0x1b];
+        uint32_t lip_cnt;
+        uint32_t unused1[0x1a];
         uint32_t tx_frames;
         uint32_t rx_frames;
         uint32_t dumped_frames;
@@ -1544,7 +1545,6 @@ typedef struct fc_port {
         int login_retry;
         atomic_t port_down_timer;
 
-        spinlock_t rport_lock;
         struct fc_rport *rport, *drport;
         u32 supported_classes;
 
@@ -2155,6 +2155,10 @@ struct qla_chip_state_84xx {
         uint32_t gold_fw_version;
 };
 
+struct qla_statistics {
+        uint32_t total_isp_aborts;
+};
+
 /*
  * Linux Host Adapter structure
  */
@@ -2166,7 +2170,6 @@ typedef struct scsi_qla_host {
         struct pci_dev  *pdev;
 
         unsigned long   host_no;
-        unsigned long   instance;
 
         volatile struct {
                 uint32_t        init_done               :1;
@@ -2515,7 +2518,7 @@ typedef struct scsi_qla_host {
 
         uint8_t         model_number[16+1];
 #define BINZERO         "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-        char            *model_desc;
+        char            model_desc[80];
         uint8_t         adapter_id[16+1];
 
         uint8_t         *node_name;
@@ -2596,6 +2599,7 @@ typedef struct scsi_qla_host {
         int             cur_vport_count;
 
         struct qla_chip_state_84xx *cs84xx;
+        struct qla_statistics qla_stats;
 } scsi_qla_host_t;
 
 
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 9b4bebee6879..0b156735e9a6 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -62,7 +62,7 @@ extern int ql2xfdmienable;
 extern int ql2xallocfwdump;
 extern int ql2xextended_error_logging;
 extern int ql2xqfullrampup;
-extern int num_hosts;
+extern int ql2xiidmaenable;
 
 extern int qla2x00_loop_reset(scsi_qla_host_t *);
 extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
@@ -71,6 +71,8 @@ extern int qla2x00_post_aen_work(struct scsi_qla_host *, enum
 extern int qla2x00_post_hwe_work(struct scsi_qla_host *, uint16_t , uint16_t,
     uint16_t, uint16_t);
 
+extern void qla2x00_abort_fcport_cmds(fc_port_t *);
+
 /*
  * Global Functions in qla_mid.c source file.
  */
@@ -312,6 +314,7 @@ extern int qla2xxx_hw_event_log(scsi_qla_host_t *, uint16_t , uint16_t,
     uint16_t, uint16_t);
 
 extern void qla2xxx_get_flash_info(scsi_qla_host_t *);
+extern int qla2xxx_get_vpd_field(scsi_qla_host_t *, char *, char *, size_t);
 
 /*
  * Global Function Prototypes in qla_dbg.c source file.
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 4cb80b476c85..c2a4bfbcb05b 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1661,6 +1661,12 @@ qla2x00_fdmi_register(scsi_qla_host_t *ha)
 {
         int rval;
 
+        if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
+                DEBUG2(printk("scsi(%ld): FDMI unsupported on "
+                    "ISP2100/ISP2200.\n", ha->host_no));
+                return QLA_SUCCESS;
+        }
+
         rval = qla2x00_mgmt_svr_login(ha);
         if (rval)
                 return rval;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index bbbc5a632a1d..601a6b29750c 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -334,6 +334,8 @@ static int
 qla2x00_isp_firmware(scsi_qla_host_t *ha)
 {
         int  rval;
+        uint16_t loop_id, topo, sw_cap;
+        uint8_t domain, area, al_pa;
 
         /* Assume loading risc code */
         rval = QLA_FUNCTION_FAILED;
@@ -345,6 +347,11 @@ qla2x00_isp_firmware(scsi_qla_host_t *ha)
 
                 /* Verify checksum of loaded RISC code. */
                 rval = qla2x00_verify_checksum(ha, ha->fw_srisc_address);
+                if (rval == QLA_SUCCESS) {
+                        /* And, verify we are not in ROM code. */
+                        rval = qla2x00_get_adapter_id(ha, &loop_id, &al_pa,
+                            &area, &domain, &topo, &sw_cap);
+                }
         }
 
         if (rval) {
@@ -722,7 +729,7 @@ qla24xx_chip_diag(scsi_qla_host_t *ha)
         /* Perform RISC reset. */
         qla24xx_reset_risc(ha);
 
-        ha->fw_transfer_size = REQUEST_ENTRY_SIZE * 1024;
+        ha->fw_transfer_size = REQUEST_ENTRY_SIZE * ha->request_q_length;
 
         rval = qla2x00_mbx_reg_test(ha);
         if (rval) {
@@ -768,42 +775,16 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)
                 mem_size = (ha->fw_memory_size - 0x100000 + 1) *
                     sizeof(uint32_t);
 
-                /* Allocate memory for Extended Trace Buffer. */
-                tc = dma_alloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
-                    GFP_KERNEL);
-                if (!tc) {
-                        qla_printk(KERN_WARNING, ha, "Unable to allocate "
-                            "(%d KB) for EFT.\n", EFT_SIZE / 1024);
-                        goto cont_alloc;
-                }
-
-                memset(tc, 0, EFT_SIZE);
-                rval = qla2x00_enable_eft_trace(ha, tc_dma, EFT_NUM_BUFFERS);
-                if (rval) {
-                        qla_printk(KERN_WARNING, ha, "Unable to initialize "
-                            "EFT (%d).\n", rval);
-                        dma_free_coherent(&ha->pdev->dev, EFT_SIZE, tc,
-                            tc_dma);
-                        goto cont_alloc;
-                }
-
-                qla_printk(KERN_INFO, ha, "Allocated (%d KB) for EFT...\n",
-                    EFT_SIZE / 1024);
-
-                eft_size = EFT_SIZE;
-                ha->eft_dma = tc_dma;
-                ha->eft = tc;
-
                 /* Allocate memory for Fibre Channel Event Buffer. */
                 if (!IS_QLA25XX(ha))
-                        goto cont_alloc;
+                        goto try_eft;
 
                 tc = dma_alloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
                     GFP_KERNEL);
                 if (!tc) {
                         qla_printk(KERN_WARNING, ha, "Unable to allocate "
                             "(%d KB) for FCE.\n", FCE_SIZE / 1024);
-                        goto cont_alloc;
+                        goto try_eft;
                 }
 
                 memset(tc, 0, FCE_SIZE);
@@ -815,7 +796,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)
                         dma_free_coherent(&ha->pdev->dev, FCE_SIZE, tc,
                             tc_dma);
                         ha->flags.fce_enabled = 0;
-                        goto cont_alloc;
+                        goto try_eft;
                 }
 
                 qla_printk(KERN_INFO, ha, "Allocated (%d KB) for FCE...\n",
@@ -825,6 +806,32 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)
                 ha->flags.fce_enabled = 1;
                 ha->fce_dma = tc_dma;
                 ha->fce = tc;
+try_eft:
+                /* Allocate memory for Extended Trace Buffer. */
+                tc = dma_alloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
+                    GFP_KERNEL);
+                if (!tc) {
+                        qla_printk(KERN_WARNING, ha, "Unable to allocate "
+                            "(%d KB) for EFT.\n", EFT_SIZE / 1024);
+                        goto cont_alloc;
+                }
+
+                memset(tc, 0, EFT_SIZE);
+                rval = qla2x00_enable_eft_trace(ha, tc_dma, EFT_NUM_BUFFERS);
+                if (rval) {
+                        qla_printk(KERN_WARNING, ha, "Unable to initialize "
+                            "EFT (%d).\n", rval);
+                        dma_free_coherent(&ha->pdev->dev, EFT_SIZE, tc,
+                            tc_dma);
+                        goto cont_alloc;
+                }
+
+                qla_printk(KERN_INFO, ha, "Allocated (%d KB) for EFT...\n",
+                    EFT_SIZE / 1024);
+
+                eft_size = EFT_SIZE;
+                ha->eft_dma = tc_dma;
+                ha->eft = tc;
         }
 cont_alloc:
         req_q_size = ha->request_q_length * sizeof(request_t);
@@ -1501,18 +1508,25 @@ qla2x00_set_model_info(scsi_qla_host_t *ha, uint8_t *model, size_t len, char *de
                 index = (ha->pdev->subsystem_device & 0xff);
                 if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
                     index < QLA_MODEL_NAMES)
-                        ha->model_desc = qla2x00_model_name[index * 2 + 1];
+                        strncpy(ha->model_desc,
+                            qla2x00_model_name[index * 2 + 1],
+                            sizeof(ha->model_desc) - 1);
         } else {
                 index = (ha->pdev->subsystem_device & 0xff);
                 if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
                     index < QLA_MODEL_NAMES) {
                         strcpy(ha->model_number,
                             qla2x00_model_name[index * 2]);
-                        ha->model_desc = qla2x00_model_name[index * 2 + 1];
+                        strncpy(ha->model_desc,
+                            qla2x00_model_name[index * 2 + 1],
+                            sizeof(ha->model_desc) - 1);
                 } else {
                         strcpy(ha->model_number, def);
                 }
         }
+        if (IS_FWI2_CAPABLE(ha))
+                qla2xxx_get_vpd_field(ha, "\x82", ha->model_desc,
+                    sizeof(ha->model_desc));
 }
 
 /* On sparc systems, obtain port and node WWN from firmware
@@ -1864,12 +1878,11 @@ qla2x00_rport_del(void *data)
 {
         fc_port_t *fcport = data;
         struct fc_rport *rport;
-        unsigned long flags;
 
-        spin_lock_irqsave(&fcport->rport_lock, flags);
+        spin_lock_irq(fcport->ha->host->host_lock);
         rport = fcport->drport;
         fcport->drport = NULL;
-        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+        spin_unlock_irq(fcport->ha->host->host_lock);
         if (rport)
                 fc_remote_port_delete(rport);
 }
@@ -1898,7 +1911,6 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)
         atomic_set(&fcport->state, FCS_UNCONFIGURED);
         fcport->flags = FCF_RLC_SUPPORT;
         fcport->supported_classes = FC_COS_UNSPECIFIED;
-        spin_lock_init(&fcport->rport_lock);
 
         return fcport;
 }
@@ -2007,8 +2019,10 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
         if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
                 if (test_bit(LOCAL_LOOP_UPDATE, &save_flags))
                         set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
-                if (test_bit(RSCN_UPDATE, &save_flags))
+                if (test_bit(RSCN_UPDATE, &save_flags)) {
+                        ha->flags.rscn_queue_overflow = 1;
                         set_bit(RSCN_UPDATE, &ha->dpc_flags);
+                }
         }
 
         return (rval);
@@ -2243,28 +2257,24 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
         struct fc_rport_identifiers rport_ids;
         struct fc_rport *rport;
-        unsigned long flags;
 
         if (fcport->drport)
                 qla2x00_rport_del(fcport);
-        if (fcport->rport)
-                return;
 
         rport_ids.node_name = wwn_to_u64(fcport->node_name);
         rport_ids.port_name = wwn_to_u64(fcport->port_name);
         rport_ids.port_id = fcport->d_id.b.domain << 16 |
             fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa;
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
-        rport = fc_remote_port_add(ha->host, 0, &rport_ids);
+        fcport->rport = rport = fc_remote_port_add(ha->host, 0, &rport_ids);
         if (!rport) {
                 qla_printk(KERN_WARNING, ha,
                     "Unable to allocate fc remote port!\n");
                 return;
         }
-        spin_lock_irqsave(&fcport->rport_lock, flags);
-        fcport->rport = rport;
+        spin_lock_irq(fcport->ha->host->host_lock);
         *((fc_port_t **)rport->dd_data) = fcport;
-        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+        spin_unlock_irq(fcport->ha->host->host_lock);
 
         rport->supported_classes = fcport->supported_classes;
 
@@ -2565,7 +2575,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 } else if (qla2x00_gnn_id(ha, swl) != QLA_SUCCESS) {
                         kfree(swl);
                         swl = NULL;
-                } else if (qla2x00_gfpn_id(ha, swl) == QLA_SUCCESS) {
+                } else if (ql2xiidmaenable &&
+                    qla2x00_gfpn_id(ha, swl) == QLA_SUCCESS) {
                         qla2x00_gpsc(ha, swl);
                 }
         }
@@ -3220,7 +3231,8 @@ qla2x00_update_fcports(scsi_qla_host_t *ha)
 
         /* Go with deferred removal of rport references. */
         list_for_each_entry(fcport, &ha->fcports, list)
-                if (fcport->drport)
+                if (fcport->drport &&
+                    atomic_read(&fcport->state) != FCS_UNCONFIGURED)
                         qla2x00_rport_del(fcport);
 }
 
@@ -3243,6 +3255,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
         if (ha->flags.online) {
                 ha->flags.online = 0;
                 clear_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+                ha->qla_stats.total_isp_aborts++;
 
                 qla_printk(KERN_INFO, ha,
                     "Performing ISP error recovery - ha= %p.\n", ha);
@@ -3283,17 +3296,6 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                         ha->isp_abort_cnt = 0;
                         clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
 
-                        if (ha->eft) {
-                                memset(ha->eft, 0, EFT_SIZE);
-                                rval = qla2x00_enable_eft_trace(ha,
-                                    ha->eft_dma, EFT_NUM_BUFFERS);
-                                if (rval) {
-                                        qla_printk(KERN_WARNING, ha,
-                                            "Unable to reinitialize EFT "
-                                            "(%d).\n", rval);
-                                }
-                        }
-
                         if (ha->fce) {
                                 ha->flags.fce_enabled = 1;
                                 memset(ha->fce, 0,
@@ -3308,6 +3310,17 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                                         ha->flags.fce_enabled = 0;
                                 }
                         }
+
+                        if (ha->eft) {
+                                memset(ha->eft, 0, EFT_SIZE);
+                                rval = qla2x00_enable_eft_trace(ha,
+                                    ha->eft_dma, EFT_NUM_BUFFERS);
+                                if (rval) {
+                                        qla_printk(KERN_WARNING, ha,
+                                            "Unable to reinitialize EFT "
+                                            "(%d).\n", rval);
+                                }
+                        }
                 } else {        /* failed the ISP abort */
                         ha->flags.online = 1;
                         if (test_bit(ISP_ABORT_RETRY, &ha->dpc_flags)) {
@@ -4026,8 +4039,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha)
         ret = qla2x00_stop_firmware(ha);
         for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT &&
             retries ; retries--) {
-                qla2x00_reset_chip(ha);
-                if (qla2x00_chip_diag(ha) != QLA_SUCCESS)
+                ha->isp_ops->reset_chip(ha);
+                if (ha->isp_ops->chip_diag(ha) != QLA_SUCCESS)
                         continue;
                 if (qla2x00_setup_chip(ha) != QLA_SUCCESS)
                         continue;
@@ -4049,7 +4062,7 @@ qla24xx_configure_vhba(scsi_qla_host_t *ha)
         rval = qla2x00_fw_ready(ha->parent);
         if (rval == QLA_SUCCESS) {
                 clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
-                qla2x00_marker(ha->parent, 0, 0, MK_SYNC_ALL);
+                qla2x00_marker(ha, 0, 0, MK_SYNC_ALL);
         }
 
         ha->flags.management_server_logged_in = 0;
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 5489d5024673..d57669aa4615 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -454,10 +454,11 @@ qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun,
 {
         int ret;
         unsigned long flags = 0;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
 
-        spin_lock_irqsave(&ha->hardware_lock, flags);
+        spin_lock_irqsave(&pha->hardware_lock, flags);
         ret = __qla2x00_marker(ha, loop_id, lun, type);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        spin_unlock_irqrestore(&pha->hardware_lock, flags);
 
         return (ret);
 }
@@ -672,7 +673,7 @@ qla24xx_start_scsi(srb_t *sp)
 {
         int             ret, nseg;
         unsigned long   flags;
-        scsi_qla_host_t *ha;
+        scsi_qla_host_t *ha, *pha;
         struct scsi_cmnd *cmd;
         uint32_t        *clr_ptr;
         uint32_t        index;
@@ -686,6 +687,7 @@ qla24xx_start_scsi(srb_t *sp)
         /* Setup device pointers. */
         ret = 0;
         ha = sp->ha;
+        pha = to_qla_parent(ha);
         reg = &ha->iobase->isp24;
         cmd = sp->cmd;
         /* So we know we haven't pci_map'ed anything yet */
@@ -700,7 +702,7 @@ qla24xx_start_scsi(srb_t *sp)
         }
 
         /* Acquire ring specific lock */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
+        spin_lock_irqsave(&pha->hardware_lock, flags);
 
         /* Check for room in outstanding command list. */
         handle = ha->current_outstanding_cmd;
@@ -795,14 +797,14 @@ qla24xx_start_scsi(srb_t *sp)
             ha->response_ring_ptr->signature != RESPONSE_PROCESSED)
                 qla24xx_process_response_queue(ha);
 
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        spin_unlock_irqrestore(&pha->hardware_lock, flags);
         return QLA_SUCCESS;
 
 queuing_error:
         if (tot_dsds)
                 scsi_dma_unmap(cmd);
 
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        spin_unlock_irqrestore(&pha->hardware_lock, flags);
 
         return QLA_FUNCTION_FAILED;
 }
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index ec63b79f900a..874d802edb7d 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -542,10 +542,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 break;
 
         case MBA_PORT_UPDATE:           /* Port database update */
-                /* Only handle SCNs for our Vport index. */
-                if (ha->parent && ha->vp_idx != (mb[3] & 0xff))
-                        break;
-
                 /*
                  * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
                  * event etc. earlier indicating loop is down) then process
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 250d2f604397..bc90d6b8d0a0 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -918,6 +918,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,
         rval = qla2x00_mailbox_command(ha, mcp);
         if (mcp->mb[0] == MBS_COMMAND_ERROR)
                 rval = QLA_COMMAND_ERROR;
+        else if (mcp->mb[0] == MBS_INVALID_COMMAND)
+                rval = QLA_INVALID_COMMAND;
 
         /* Return data. */
         *id = mcp->mb[1];
@@ -2161,17 +2163,18 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)
         struct abort_entry_24xx *abt;
         dma_addr_t      abt_dma;
         uint32_t        handle;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
 
         DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
 
         fcport = sp->fcport;
 
-        spin_lock_irqsave(&ha->hardware_lock, flags);
+        spin_lock_irqsave(&pha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
-                if (ha->outstanding_cmds[handle] == sp)
+                if (pha->outstanding_cmds[handle] == sp)
                         break;
         }
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        spin_unlock_irqrestore(&pha->hardware_lock, flags);
         if (handle == MAX_OUTSTANDING_COMMANDS) {
                 /* Command not found. */
                 return QLA_FUNCTION_FAILED;
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 62a3ad6e8ecb..50baf6a1d67c 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -43,6 +43,7 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
 
         set_bit(vp_id, ha->vp_idx_map);
         ha->num_vhosts++;
+        ha->cur_vport_count++;
         vha->vp_idx = vp_id;
         list_add_tail(&vha->vp_list, &ha->vp_list);
         mutex_unlock(&ha->vport_lock);
@@ -58,6 +59,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
         mutex_lock(&ha->vport_lock);
         vp_id = vha->vp_idx;
         ha->num_vhosts--;
+        ha->cur_vport_count--;
         clear_bit(vp_id, ha->vp_idx_map);
         list_del(&vha->vp_list);
         mutex_unlock(&ha->vport_lock);
@@ -103,8 +105,8 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha)
                     "loop_id=0x%04x :%x\n",
                     vha->host_no, fcport->loop_id, fcport->vp_idx));
 
-                atomic_set(&fcport->state, FCS_DEVICE_DEAD);
                 qla2x00_mark_device_lost(vha, fcport, 0, 0);
+                atomic_set(&fcport->state, FCS_UNCONFIGURED);
         }
 }
 
@@ -276,7 +278,8 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
                 clear_bit(RESET_ACTIVE, &vha->dpc_flags);
         }
 
-        if (test_and_clear_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags)) {
+        if (atomic_read(&vha->vp_state) == VP_ACTIVE &&
+            test_and_clear_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags)) {
                 if (!(test_and_set_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags))) {
                         qla2x00_loop_resync(vha);
                         clear_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags);
@@ -390,7 +393,6 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         vha->parent = ha;
         vha->fc_vport = fc_vport;
         vha->device_flags = 0;
-        vha->instance = num_hosts;
         vha->vp_idx = qla24xx_allocate_vp_id(vha);
         if (vha->vp_idx > ha->max_npiv_vports) {
                 DEBUG15(printk("scsi(%ld): Couldn't allocate vp_id.\n",
@@ -428,7 +430,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         host->max_cmd_len = MAX_CMDSZ;
         host->max_channel = MAX_BUSES - 1;
         host->max_lun = MAX_LUNS;
-        host->unique_id = vha->instance;
+        host->unique_id = host->host_no;
         host->max_id = MAX_TARGETS_2200;
         host->transportt = qla2xxx_transport_vport_template;
 
@@ -436,12 +438,6 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
             vha->host_no, vha));
 
         vha->flags.init_done = 1;
-        num_hosts++;
-
-        mutex_lock(&ha->vport_lock);
-        set_bit(vha->vp_idx, ha->vp_idx_map);
-        ha->cur_vport_count++;
-        mutex_unlock(&ha->vport_lock);
 
         return vha;
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 48eaa3bb5433..7c8af7ed2a5d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -27,7 +27,6 @@ char qla2x00_version_str[40];
  */
 static struct kmem_cache *srb_cachep;
 
-int num_hosts;
 int ql2xlogintimeout = 20;
 module_param(ql2xlogintimeout, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xlogintimeout,
@@ -87,6 +86,13 @@ MODULE_PARM_DESC(ql2xqfullrampup,
                 "depth for a device after a queue-full condition has been "
                 "detected.  Default is 120 seconds.");
 
+int ql2xiidmaenable=1;
+module_param(ql2xiidmaenable, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xiidmaenable,
+                "Enables iIDMA settings "
+                "Default is 1 - perform iIDMA. 0 - no iIDMA.");
+
+
 /*
  * SCSI host template entry points
  */
@@ -388,7 +394,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         }
 
         /* Close window on fcport/rport state-transitioning. */
-        if (!*(fc_port_t **)rport->dd_data) {
+        if (fcport->drport) {
                 cmd->result = DID_IMM_RETRY << 16;
                 goto qc_fail_command;
         }
@@ -443,7 +449,7 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         int rval;
         scsi_qla_host_t *pha = to_qla_parent(ha);
 
-        if (unlikely(pci_channel_offline(ha->pdev))) {
+        if (unlikely(pci_channel_offline(pha->pdev))) {
                 cmd->result = DID_REQUEUE << 16;
                 goto qc24_fail_command;
         }
@@ -455,7 +461,7 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         }
 
         /* Close window on fcport/rport state-transitioning. */
-        if (!*(fc_port_t **)rport->dd_data) {
+        if (fcport->drport) {
                 cmd->result = DID_IMM_RETRY << 16;
                 goto qc24_fail_command;
         }
@@ -617,6 +623,40 @@ qla2x00_wait_for_loop_ready(scsi_qla_host_t *ha)
         return (return_status);
 }
 
+void
+qla2x00_abort_fcport_cmds(fc_port_t *fcport)
+{
+        int cnt;
+        unsigned long flags;
+        srb_t *sp;
+        scsi_qla_host_t *ha = fcport->ha;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
+
+        spin_lock_irqsave(&pha->hardware_lock, flags);
+        for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
+                sp = pha->outstanding_cmds[cnt];
+                if (!sp)
+                        continue;
+                if (sp->fcport != fcport)
+                        continue;
+
+                spin_unlock_irqrestore(&pha->hardware_lock, flags);
+                if (ha->isp_ops->abort_command(ha, sp)) {
+                        DEBUG2(qla_printk(KERN_WARNING, ha,
+                            "Abort failed --  %lx\n", sp->cmd->serial_number));
+                } else {
+                        if (qla2x00_eh_wait_on_command(ha, sp->cmd) !=
+                            QLA_SUCCESS)
+                                DEBUG2(qla_printk(KERN_WARNING, ha,
+                                    "Abort failed while waiting --  %lx\n",
+                                    sp->cmd->serial_number));
+
+                }
+                spin_lock_irqsave(&pha->hardware_lock, flags);
+        }
+        spin_unlock_irqrestore(&pha->hardware_lock, flags);
+}
+
 static void
 qla2x00_block_error_handler(struct scsi_cmnd *cmnd)
 {
@@ -1073,7 +1113,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
         else
                 scsi_deactivate_tcq(sdev, ha->max_q_depth);
 
-        rport->dev_loss_tmo = ha->port_down_retry_count + 5;
+        rport->dev_loss_tmo = ha->port_down_retry_count;
 
         return 0;
 }
@@ -1629,9 +1669,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
         host->can_queue = ha->request_q_length + 128;
 
-        /* load the F/W, read paramaters, and init the H/W */
-        ha->instance = num_hosts;
-
         mutex_init(&ha->vport_lock);
         init_completion(&ha->mbx_cmd_comp);
         complete(&ha->mbx_cmd_comp);
@@ -1679,7 +1716,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         host->this_id = 255;
         host->cmd_per_lun = 3;
-        host->unique_id = ha->instance;
+        host->unique_id = host->host_no;
         host->max_cmd_len = MAX_CMDSZ;
         host->max_channel = MAX_BUSES - 1;
         host->max_lun = MAX_LUNS;
@@ -1700,8 +1737,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ha->flags.init_done = 1;
         ha->flags.online = 1;
 
-        num_hosts++;
-
         ret = scsi_add_host(host, &pdev->dev);
         if (ret)
                 goto probe_failed;
@@ -1813,27 +1848,21 @@ static inline void
 qla2x00_schedule_rport_del(struct scsi_qla_host *ha, fc_port_t *fcport,
     int defer)
 {
-        unsigned long flags;
         struct fc_rport *rport;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
 
         if (!fcport->rport)
                 return;
 
         rport = fcport->rport;
         if (defer) {
-                spin_lock_irqsave(&fcport->rport_lock, flags);
+                spin_lock_irq(ha->host->host_lock);
                 fcport->drport = rport;
-                fcport->rport = NULL;
-                *(fc_port_t **)rport->dd_data = NULL;
-                spin_unlock_irqrestore(&fcport->rport_lock, flags);
-                set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags);
-        } else {
-                spin_lock_irqsave(&fcport->rport_lock, flags);
-                fcport->rport = NULL;
-                *(fc_port_t **)rport->dd_data = NULL;
-                spin_unlock_irqrestore(&fcport->rport_lock, flags);
+                spin_unlock_irq(ha->host->host_lock);
+                set_bit(FCPORT_UPDATE_NEEDED, &pha->dpc_flags);
+                qla2xxx_wake_dpc(pha);
+        } else
                 fc_remote_port_delete(rport);
-        }
 }
 
 /*
@@ -1903,7 +1932,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer)
         scsi_qla_host_t *pha = to_qla_parent(ha);
 
         list_for_each_entry(fcport, &pha->fcports, list) {
-                if (ha->vp_idx != 0 && ha->vp_idx != fcport->vp_idx)
+                if (ha->vp_idx != fcport->vp_idx)
                         continue;
                 /*
                  * No point in marking the device as lost, if the device is
@@ -1911,17 +1940,10 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer)
                  */
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD)
                         continue;
-                if (atomic_read(&fcport->state) == FCS_ONLINE) {
-                        if (defer)
-                                qla2x00_schedule_rport_del(ha, fcport, defer);
-                        else if (ha->vp_idx == fcport->vp_idx)
-                                qla2x00_schedule_rport_del(ha, fcport, defer);
-                }
+                if (atomic_read(&fcport->state) == FCS_ONLINE)
+                        qla2x00_schedule_rport_del(ha, fcport, defer);
                 atomic_set(&fcport->state, FCS_DEVICE_LOST);
         }
-
-        if (defer)
-                qla2xxx_wake_dpc(ha);
 }
 
 /*
@@ -2156,7 +2178,7 @@ qla2x00_alloc_work(struct scsi_qla_host *ha, enum qla_work_type type,
 static int
 qla2x00_post_work(struct scsi_qla_host *ha, struct qla_work_evt *e, int locked)
 {
-        unsigned long flags;
+        unsigned long uninitialized_var(flags);
         scsi_qla_host_t *pha = to_qla_parent(ha);
 
         if (!locked)
@@ -2313,8 +2335,10 @@ qla2x00_do_dpc(void *data)
                             ha->host_no));
                 }
 
-                if (test_and_clear_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags))
+                if (test_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags)) {
                         qla2x00_update_fcports(ha);
+                        clear_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags);
+                }
 
                 if (test_and_clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) &&
                     (!(test_and_set_bit(RESET_ACTIVE, &ha->dpc_flags)))) {
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 1728ab3ccb20..1bca74474935 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -869,11 +869,9 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
         uint32_t i;
         uint32_t *dwptr;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-        unsigned long flags;
 
         ret = QLA_SUCCESS;
 
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         /* Enable flash write. */
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
@@ -907,7 +905,6 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
         RD_REG_DWORD(&reg->ctrl_status);        /* PCI Posting. */
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         return ret;
 }
@@ -2306,6 +2303,51 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
 }
 
 static int
+qla2xxx_is_vpd_valid(uint8_t *pos, uint8_t *end)
+{
+        if (pos >= end || *pos != 0x82)
+                return 0;
+
+        pos += 3 + pos[1];
+        if (pos >= end || *pos != 0x90)
+                return 0;
+
+        pos += 3 + pos[1];
+        if (pos >= end || *pos != 0x78)
+                return 0;
+
+        return 1;
+}
+
+int
+qla2xxx_get_vpd_field(scsi_qla_host_t *ha, char *key, char *str, size_t size)
+{
+        uint8_t *pos = ha->vpd;
+        uint8_t *end = pos + ha->vpd_size;
+        int len = 0;
+
+        if (!IS_FWI2_CAPABLE(ha) || !qla2xxx_is_vpd_valid(pos, end))
+                return 0;
+
+        while (pos < end && *pos != 0x78) {
+                len = (*pos == 0x82) ? pos[1] : pos[2];
+
+                if (!strncmp(pos, key, strlen(key)))
+                        break;
+
+                if (*pos != 0x90 && *pos != 0x91)
+                        pos += len;
+
+                pos += 3;
+        }
+
+        if (pos < end - len && *pos != 0x78)
+                return snprintf(str, size, "%.*s", len, pos + 3);
+
+        return 0;
+}
+
+static int
 qla2xxx_hw_event_store(scsi_qla_host_t *ha, uint32_t *fdata)
 {
         uint32_t d[2], faddr;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index d058c8862b35..676c390db354 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.02.01-k4"
+#define QLA2XXX_VERSION      "8.02.01-k6"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 5822dd595826..88bebb13bc52 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -46,6 +46,8 @@ MODULE_PARM_DESC(ql4xextended_error_logging,
 
 int ql4_mod_unload = 0;
 
+#define QL4_DEF_QDEPTH 32
+
 /*
  * SCSI host template entry points
  */
@@ -1387,7 +1389,7 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
 
         sdev->hostdata = ddb;
         sdev->tagged_supported = 1;
-        scsi_activate_tcq(sdev, sdev->host->can_queue);
+        scsi_activate_tcq(sdev, QL4_DEF_QDEPTH);
         return 0;
 }
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 36c92f961e15..ee6be596503d 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -197,11 +197,43 @@ static void
 scsi_pool_free_command(struct scsi_host_cmd_pool *pool,
                          struct scsi_cmnd *cmd)
 {
+        if (cmd->prot_sdb)
+                kmem_cache_free(scsi_sdb_cache, cmd->prot_sdb);
+
         kmem_cache_free(pool->sense_slab, cmd->sense_buffer);
         kmem_cache_free(pool->cmd_slab, cmd);
 }
 
 /**
+ * scsi_host_alloc_command - internal function to allocate command
+ * @shost:      SCSI host whose pool to allocate from
+ * @gfp_mask:   mask for the allocation
+ *
+ * Returns a fully allocated command with sense buffer and protection
+ * data buffer (where applicable) or NULL on failure
+ */
+static struct scsi_cmnd *
+scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask)
+{
+        struct scsi_cmnd *cmd;
+
+        cmd = scsi_pool_alloc_command(shost->cmd_pool, gfp_mask);
+        if (!cmd)
+                return NULL;
+
+        if (scsi_host_get_prot(shost) >= SHOST_DIX_TYPE0_PROTECTION) {
+                cmd->prot_sdb = kmem_cache_zalloc(scsi_sdb_cache, gfp_mask);
+
+                if (!cmd->prot_sdb) {
+                        scsi_pool_free_command(shost->cmd_pool, cmd);
+                        return NULL;
+                }
+        }
+
+        return cmd;
+}
+
+/**
  * __scsi_get_command - Allocate a struct scsi_cmnd
  * @shost: host to transmit command
  * @gfp_mask: allocation mask
@@ -214,7 +246,7 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
         struct scsi_cmnd *cmd;
         unsigned char *buf;
 
-        cmd = scsi_pool_alloc_command(shost->cmd_pool, gfp_mask);
+        cmd = scsi_host_alloc_command(shost, gfp_mask);
 
         if (unlikely(!cmd)) {
                 unsigned long flags;
@@ -457,7 +489,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
         /*
          * Get one backup command for this host.
          */
-        cmd = scsi_pool_alloc_command(shost->cmd_pool, gfp_mask);
+        cmd = scsi_host_alloc_command(shost, gfp_mask);
         if (!cmd) {
                 scsi_put_host_cmd_pool(gfp_mask);
                 shost->cmd_pool = NULL;
@@ -902,11 +934,20 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
 
         spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
 
-        /* Check to see if the queue is managed by the block layer.
-         * If it is, and we fail to adjust the depth, exit. */
-        if (blk_queue_tagged(sdev->request_queue) &&
-            blk_queue_resize_tags(sdev->request_queue, tags) != 0)
-                goto out;
+        /*
+         * Check to see if the queue is managed by the block layer.
+         * If it is, and we fail to adjust the depth, exit.
+         *
+         * Do not resize the tag map if it is a host wide share bqt,
+         * because the size should be the hosts's can_queue. If there
+         * is more IO than the LLD's can_queue (so there are not enuogh
+         * tags) request_fn's host queue ready check will handle it.
+         */
+        if (!sdev->host->bqt) {
+                if (blk_queue_tagged(sdev->request_queue) &&
+                    blk_queue_resize_tags(sdev->request_queue, tags) != 0)
+                        goto out;
+        }
 
         sdev->queue_depth = tags;
         switch (tagged) {
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 01d11a01ffbf..27c633f55794 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1753,7 +1753,7 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev)
                 open_devip = sdebug_device_create(sdbg_host, GFP_ATOMIC);
                 if (!open_devip) {
                         printk(KERN_ERR "%s: out of memory at line %d\n",
-                                __FUNCTION__, __LINE__);
+                                __func__, __LINE__);
                         return NULL;
                 }
         }
@@ -2656,7 +2656,7 @@ static int sdebug_add_adapter(void)
         sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL);
         if (NULL == sdbg_host) {
                 printk(KERN_ERR "%s: out of memory at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 return -ENOMEM;
         }
 
@@ -2667,7 +2667,7 @@ static int sdebug_add_adapter(void)
                 sdbg_devinfo = sdebug_device_create(sdbg_host, GFP_KERNEL);
                 if (!sdbg_devinfo) {
                         printk(KERN_ERR "%s: out of memory at line %d\n",
-                               __FUNCTION__, __LINE__);
+                               __func__, __LINE__);
                         error = -ENOMEM;
                         goto clean;
                 }
@@ -2987,7 +2987,7 @@ static int sdebug_driver_probe(struct device * dev)
 
         hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
         if (NULL == hpnt) {
-                printk(KERN_ERR "%s: scsi_register failed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: scsi_register failed\n", __func__);
                 error = -ENODEV;
                 return error;
         }
@@ -3002,7 +3002,7 @@ static int sdebug_driver_probe(struct device * dev)
 
         error = scsi_add_host(hpnt, &sdbg_host->dev);
         if (error) {
-                printk(KERN_ERR "%s: scsi_add_host failed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: scsi_add_host failed\n", __func__);
                 error = -ENODEV;
                 scsi_host_put(hpnt);
         } else
@@ -3021,7 +3021,7 @@ static int sdebug_driver_remove(struct device * dev)
 
         if (!sdbg_host) {
                 printk(KERN_ERR "%s: Unable to locate host info\n",
-                       __FUNCTION__);
+                       __func__);
                 return -ENODEV;
         }
 
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index a235802f2981..4969e4ec75ea 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -272,7 +272,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
         }
         if (from_length > to_length)
                  printk(KERN_WARNING "%s: %s string '%s' is too long\n",
-                        __FUNCTION__, name, from);
+                        __func__, name, from);
 }
 
 /**
@@ -298,7 +298,7 @@ static int scsi_dev_info_list_add(int compatible, char *vendor, char *model,
 
         devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL);
         if (!devinfo) {
-                printk(KERN_ERR "%s: no memory\n", __FUNCTION__);
+                printk(KERN_ERR "%s: no memory\n", __func__);
                 return -ENOMEM;
         }
 
@@ -363,7 +363,7 @@ static int scsi_dev_info_list_add_str(char *dev_list)
                         strflags = strsep(&next, next_check);
                 if (!model || !strflags) {
                         printk(KERN_ERR "%s: bad dev info string '%s' '%s'"
-                               " '%s'\n", __FUNCTION__, vendor, model,
+                               " '%s'\n", __func__, vendor, model,
                                strflags);
                         res = -EINVAL;
                 } else
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 006a95916f72..880051c89bde 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -139,7 +139,7 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,
         scmd->eh_timeout.function = (void (*)(unsigned long)) complete;
 
         SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p, time:"
-                                          " %d, (%p)\n", __FUNCTION__,
+                                          " %d, (%p)\n", __func__,
                                           scmd, timeout, complete));
 
         add_timer(&scmd->eh_timeout);
@@ -163,7 +163,7 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
         rtn = del_timer(&scmd->eh_timeout);
 
         SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p,"
-                                         " rtn: %d\n", __FUNCTION__,
+                                         " rtn: %d\n", __func__,
                                          scmd, rtn));
 
         scmd->eh_timeout.data = (unsigned long)NULL;
@@ -233,7 +233,7 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev)
 
         online = scsi_device_online(sdev);
 
-        SCSI_LOG_ERROR_RECOVERY(5, printk("%s: rtn: %d\n", __FUNCTION__,
+        SCSI_LOG_ERROR_RECOVERY(5, printk("%s: rtn: %d\n", __func__,
                                           online));
 
         return online;
@@ -271,7 +271,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 sdev_printk(KERN_INFO, sdev,
                                             "%s: cmds failed: %d, cancel: %d\n",
-                                            __FUNCTION__, cmd_failed,
+                                            __func__, cmd_failed,
                                             cmd_cancel));
                         cmd_cancel = 0;
                         cmd_failed = 0;
@@ -344,6 +344,9 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
                 return /* soft_error */ SUCCESS;
 
         case ABORTED_COMMAND:
+                if (sshdr.asc == 0x10) /* DIF */
+                        return SUCCESS;
+
                 return NEEDS_RETRY;
         case NOT_READY:
         case UNIT_ATTENTION:
@@ -470,7 +473,7 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
 
         SCSI_LOG_ERROR_RECOVERY(3,
                 printk("%s scmd: %p result: %x\n",
-                        __FUNCTION__, scmd, scmd->result));
+                        __func__, scmd, scmd->result));
 
         eh_action = scmd->device->host->eh_action;
         if (eh_action)
@@ -487,7 +490,7 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)
         int rtn;
 
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Host RST\n",
-                                          __FUNCTION__));
+                                          __func__));
 
         if (!scmd->device->host->hostt->eh_host_reset_handler)
                 return FAILED;
@@ -516,7 +519,7 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)
         int rtn;
 
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Bus RST\n",
-                                          __FUNCTION__));
+                                          __func__));
 
         if (!scmd->device->host->hostt->eh_bus_reset_handler)
                 return FAILED;
@@ -664,7 +667,10 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,
         ses->sdb = scmd->sdb;
         ses->next_rq = scmd->request->next_rq;
         ses->result = scmd->result;
+        ses->underflow = scmd->underflow;
+        ses->prot_op = scmd->prot_op;
 
+        scmd->prot_op = SCSI_PROT_NORMAL;
         scmd->cmnd = ses->eh_cmnd;
         memset(scmd->cmnd, 0, BLK_MAX_CDB);
         memset(&scmd->sdb, 0, sizeof(scmd->sdb));
@@ -722,6 +728,8 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses)
         scmd->sdb = ses->sdb;
         scmd->request->next_rq = ses->next_rq;
         scmd->result = ses->result;
+        scmd->underflow = ses->underflow;
+        scmd->prot_op = ses->prot_op;
 }
 EXPORT_SYMBOL(scsi_eh_restore_cmnd);
 
@@ -766,7 +774,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 
         SCSI_LOG_ERROR_RECOVERY(3,
                 printk("%s: scmd: %p, timeleft: %ld\n",
-                        __FUNCTION__, scmd, timeleft));
+                        __func__, scmd, timeleft));
 
         /*
          * If there is time left scsi_eh_done got called, and we will
@@ -778,7 +786,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
                 rtn = scsi_eh_completed_normally(scmd);
                 SCSI_LOG_ERROR_RECOVERY(3,
                         printk("%s: scsi_eh_completed_normally %x\n",
-                               __FUNCTION__, rtn));
+                               __func__, rtn));
 
                 switch (rtn) {
                 case SUCCESS:
@@ -913,7 +921,7 @@ retry_tur:
         rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0);
 
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n",
-                __FUNCTION__, scmd, rtn));
+                __func__, scmd, rtn));
 
         switch (rtn) {
         case NEEDS_RETRY:
@@ -1296,7 +1304,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
         if (!scsi_device_online(scmd->device)) {
                 SCSI_LOG_ERROR_RECOVERY(5, printk("%s: device offline - report"
                                                   " as SUCCESS\n",
-                                                  __FUNCTION__));
+                                                  __func__));
                 return SUCCESS;
         }
 
@@ -1511,7 +1519,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
          * ioctls to queued block devices.
          */
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n",
-                                          __FUNCTION__));
+                                          __func__));
 
         spin_lock_irqsave(shost->host_lock, flags);
         if (scsi_host_set_state(shost, SHOST_RUNNING))
@@ -1835,7 +1843,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
          */
         SCSI_LOG_ERROR_RECOVERY(3,
                 printk("%s: waking up host to restart after TMF\n",
-                __FUNCTION__));
+                __func__));
 
         wake_up(&shost->host_wait);
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 88d1b5f44e59..ff5d56b3ee4d 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -65,7 +65,7 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = {
 };
 #undef SP
 
-static struct kmem_cache *scsi_sdb_cache;
+struct kmem_cache *scsi_sdb_cache;
 
 static void scsi_run_queue(struct request_queue *q);
 
@@ -787,6 +787,9 @@ void scsi_release_buffers(struct scsi_cmnd *cmd)
                 kmem_cache_free(scsi_sdb_cache, bidi_sdb);
                 cmd->request->next_rq->special = NULL;
         }
+
+        if (scsi_prot_sg_count(cmd))
+                scsi_free_sgtable(cmd->prot_sdb);
 }
 EXPORT_SYMBOL(scsi_release_buffers);
 
@@ -947,9 +950,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                                  * 6-byte command.
                                  */
                                 scsi_requeue_command(q, cmd);
-                                return;
-                        } else {
+                        } else if (sshdr.asc == 0x10) /* DIX */
+                                scsi_end_request(cmd, -EIO, this_count, 0);
+                        else
                                 scsi_end_request(cmd, -EIO, this_count, 1);
+                        return;
+                case ABORTED_COMMAND:
+                        if (sshdr.asc == 0x10) { /* DIF */
+                                scsi_end_request(cmd, -EIO, this_count, 0);
                                 return;
                         }
                         break;
@@ -1072,6 +1080,26 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
                         goto err_exit;
         }
 
+        if (blk_integrity_rq(cmd->request)) {
+                struct scsi_data_buffer *prot_sdb = cmd->prot_sdb;
+                int ivecs, count;
+
+                BUG_ON(prot_sdb == NULL);
+                ivecs = blk_rq_count_integrity_sg(cmd->request);
+
+                if (scsi_alloc_sgtable(prot_sdb, ivecs, gfp_mask)) {
+                        error = BLKPREP_DEFER;
+                        goto err_exit;
+                }
+
+                count = blk_rq_map_integrity_sg(cmd->request,
+                                                prot_sdb->table.sgl);
+                BUG_ON(unlikely(count > ivecs));
+
+                cmd->prot_sdb = prot_sdb;
+                cmd->prot_sdb->table.nents = count;
+        }
+
         return BLKPREP_OK ;
 
 err_exit:
@@ -1367,7 +1395,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
 
         if (unlikely(cmd == NULL)) {
                 printk(KERN_CRIT "impossible request in %s.\n",
-                                 __FUNCTION__);
+                                 __func__);
                 BUG();
         }
 
@@ -1491,12 +1519,27 @@ static void scsi_request_fn(struct request_queue *q)
                         printk(KERN_CRIT "impossible request in %s.\n"
                                          "please mail a stack trace to "
                                          "linux-scsi@vger.kernel.org\n",
-                                         __FUNCTION__);
+                                         __func__);
                         blk_dump_rq_flags(req, "foo");
                         BUG();
                 }
                 spin_lock(shost->host_lock);
 
+                /*
+                 * We hit this when the driver is using a host wide
+                 * tag map. For device level tag maps the queue_depth check
+                 * in the device ready fn would prevent us from trying
+                 * to allocate a tag. Since the map is a shared host resource
+                 * we add the dev to the starved list so it eventually gets
+                 * a run when a tag is freed.
+                 */
+                if (blk_queue_tagged(q) && !blk_rq_tagged(req)) {
+                        if (list_empty(&sdev->starved_entry))
+                                list_add_tail(&sdev->starved_entry,
+                                              &shost->starved_list);
+                        goto not_ready;
+                }
+
                 if (!scsi_host_queue_ready(q, shost, sdev))
                         goto not_ready;
                 if (scsi_target(sdev)->single_lun) {
@@ -2486,7 +2529,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count,
         if (unlikely(i == sg_count)) {
                 printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, "
                         "elements %d\n",
-                       __FUNCTION__, sg_len, *offset, sg_count);
+                       __func__, sg_len, *offset, sg_count);
                 WARN_ON(1);
                 return NULL;
         }
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 370c78cc1cb5..ae7ed9a22662 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -55,7 +55,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                 if ((nlh->nlmsg_len < (sizeof(*nlh) + sizeof(*hdr))) ||
                     (skb->len < nlh->nlmsg_len)) {
                         printk(KERN_WARNING "%s: discarding partial skb\n",
-                                 __FUNCTION__);
+                                 __func__);
                         return;
                 }
 
@@ -82,7 +82,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
 
                 if (nlh->nlmsg_len < (sizeof(*nlh) + hdr->msglen)) {
                         printk(KERN_WARNING "%s: discarding partial message\n",
-                                 __FUNCTION__);
+                                 __func__);
                         return;
                 }
 
@@ -139,7 +139,7 @@ scsi_netlink_init(void)
         error = netlink_register_notifier(&scsi_netlink_notifier);
         if (error) {
                 printk(KERN_ERR "%s: register of event handler failed - %d\n",
-                                __FUNCTION__, error);
+                                __func__, error);
                 return;
         }
 
@@ -148,7 +148,7 @@ scsi_netlink_init(void)
                                 THIS_MODULE);
         if (!scsi_nl_sock) {
                 printk(KERN_ERR "%s: register of recieve handler failed\n",
-                                __FUNCTION__);
+                                __func__);
                 netlink_unregister_notifier(&scsi_netlink_notifier);
         }
 
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index b33e72516ef8..79f0f7511204 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -77,6 +77,7 @@ extern void scsi_exit_queue(void);
 struct request_queue;
 struct request;
 extern int scsi_prep_fn(struct request_queue *, struct request *);
+extern struct kmem_cache *scsi_sdb_cache;
 
 /* scsi_proc.c */
 #ifdef CONFIG_SCSI_PROC_FS
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index e4a0d2f9b357..c6a904a45bf9 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -114,7 +114,7 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
                 sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
                 if (!sht->proc_dir)
                         printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
-                               __FUNCTION__, sht->proc_name);
+                               __func__, sht->proc_name);
                 else
                         sht->proc_dir->owner = sht->module;
         }
@@ -157,7 +157,7 @@ void scsi_proc_host_add(struct Scsi_Host *shost)
                         sht->proc_dir, proc_scsi_read, shost);
         if (!p) {
                 printk(KERN_ERR "%s: Failed to register host %d in"
-                       "%s\n", __FUNCTION__, shost->host_no,
+                       "%s\n", __func__, shost->host_no,
                        sht->proc_name);
                 return;
         } 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 196fe3af0d5e..84b4879cff11 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -318,7 +318,7 @@ out_device_destroy:
         put_device(&sdev->sdev_gendev);
 out:
         if (display_failure_msg)
-                printk(ALLOC_FAILURE_MSG, __FUNCTION__);
+                printk(ALLOC_FAILURE_MSG, __func__);
         return NULL;
 }
 
@@ -404,7 +404,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
 
         starget = kzalloc(size, GFP_KERNEL);
         if (!starget) {
-                printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__);
+                printk(KERN_ERR "%s: allocation failure\n", __func__);
                 return NULL;
         }
         dev = &starget->dev;
@@ -1337,7 +1337,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
         lun_data = kmalloc(length, GFP_ATOMIC |
                            (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0));
         if (!lun_data) {
-                printk(ALLOC_FAILURE_MSG, __FUNCTION__);
+                printk(ALLOC_FAILURE_MSG, __func__);
                 goto out;
         }
 
@@ -1649,7 +1649,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
 {
         SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost,
                 "%s: <%u:%u:%u>\n",
-                __FUNCTION__, channel, id, lun));
+                __func__, channel, id, lun));
 
         if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||
             ((id != SCAN_WILD_CARD) && (id >= shost->max_id)) ||
@@ -1703,7 +1703,7 @@ static struct async_scan_data *scsi_prep_async_scan(struct Scsi_Host *shost)
                 return NULL;
 
         if (shost->async_scan) {
-                printk("%s called twice for host %d", __FUNCTION__,
+                printk("%s called twice for host %d", __func__,
                                 shost->host_no);
                 dump_stack();
                 return NULL;
@@ -1757,9 +1757,10 @@ static void scsi_finish_async_scan(struct async_scan_data *data)
         mutex_lock(&shost->scan_mutex);
 
         if (!shost->async_scan) {
-                printk("%s called twice for host %d", __FUNCTION__,
+                printk("%s called twice for host %d", __func__,
                                 shost->host_no);
                 dump_stack();
+                mutex_unlock(&shost->scan_mutex);
                 return;
         }
 
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index b6e561059779..ab3c71869be5 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -249,6 +249,8 @@ shost_rd_attr(cmd_per_lun, "%hd\n");
 shost_rd_attr(can_queue, "%hd\n");
 shost_rd_attr(sg_tablesize, "%hu\n");
 shost_rd_attr(unchecked_isa_dma, "%d\n");
+shost_rd_attr(prot_capabilities, "%u\n");
+shost_rd_attr(prot_guard_type, "%hd\n");
 shost_rd_attr2(proc_name, hostt->proc_name, "%s\n");
 
 static struct attribute *scsi_sysfs_shost_attrs[] = {
@@ -263,6 +265,8 @@ static struct attribute *scsi_sysfs_shost_attrs[] = {
         &dev_attr_hstate.attr,
         &dev_attr_supported_mode.attr,
         &dev_attr_active_mode.attr,
+        &dev_attr_prot_capabilities.attr,
+        &dev_attr_prot_guard_type.attr,
         NULL
 };
 
diff --git a/drivers/scsi/scsi_tgt_priv.h b/drivers/scsi/scsi_tgt_priv.h
index cb92888948f9..fe4c62177f78 100644
--- a/drivers/scsi/scsi_tgt_priv.h
+++ b/drivers/scsi/scsi_tgt_priv.h
@@ -6,7 +6,7 @@ struct task_struct;
 /* tmp - will replace with SCSI logging stuff */
 #define eprintk(fmt, args...)                                   \
 do {                                                            \
-        printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args);  \
+        printk("%s(%d) " fmt, __func__, __LINE__, ##args);      \
 } while (0)
 
 #define dprintk(fmt, args...)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index a272b9a2c869..56823fd1fb84 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -571,7 +571,7 @@ send_fail:
         name = get_fc_host_event_code_name(event_code);
         printk(KERN_WARNING
                 "%s: Dropped Event : host %d %s data 0x%08x - err %d\n",
-                __FUNCTION__, shost->host_no,
+                __func__, shost->host_no,
                 (name) ? name : "<unknown>", event_data, err);
         return;
 }
@@ -644,7 +644,7 @@ send_vendor_fail_skb:
 send_vendor_fail:
         printk(KERN_WARNING
                 "%s: Dropped Event : host %d vendor_unique - err %d\n",
-                __FUNCTION__, shost->host_no, err);
+                __func__, shost->host_no, err);
         return;
 }
 EXPORT_SYMBOL(fc_host_post_vendor_event);
@@ -2464,7 +2464,7 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
         size = (sizeof(struct fc_rport) + fci->f->dd_fcrport_size);
         rport = kzalloc(size, GFP_KERNEL);
         if (unlikely(!rport)) {
-                printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__);
+                printk(KERN_ERR "%s: allocation failure\n", __func__);
                 return NULL;
         }
 
@@ -3137,7 +3137,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
         size = (sizeof(struct fc_vport) + fci->f->dd_fcvport_size);
         vport = kzalloc(size, GFP_KERNEL);
         if (unlikely(!vport)) {
-                printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__);
+                printk(KERN_ERR "%s: allocation failure\n", __func__);
                 return -ENOMEM;
         }
 
@@ -3201,7 +3201,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
                         printk(KERN_ERR
                                 "%s: Cannot create vport symlinks for "
                                 "%s, err=%d\n",
-                                __FUNCTION__, dev->bus_id, error);
+                                __func__, dev->bus_id, error);
         }
         spin_lock_irqsave(shost->host_lock, flags);
         vport->flags &= ~FC_VPORT_CREATING;
@@ -3314,7 +3314,7 @@ fc_vport_sched_delete(struct work_struct *work)
         if (stat)
                 dev_printk(KERN_ERR, vport->dev.parent,
                         "%s: %s could not be deleted created via "
-                        "shost%d channel %d - error %d\n", __FUNCTION__,
+                        "shost%d channel %d - error %d\n", __func__,
                         vport->dev.bus_id, vport->shost->host_no,
                         vport->channel, stat);
 }
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index f4461d35ffb9..366609386be1 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -779,7 +779,7 @@ static void sas_port_create_link(struct sas_port *port,
         return;
 err:
         printk(KERN_ERR "%s: Cannot create port links, err=%d\n",
-               __FUNCTION__, res);
+               __func__, res);
 }
 
 static void sas_port_delete_link(struct sas_port *port,
@@ -1029,7 +1029,7 @@ void sas_port_mark_backlink(struct sas_port *port)
         return;
 err:
         printk(KERN_ERR "%s: Cannot create port backlink, err=%d\n",
-               __FUNCTION__, res);
+               __func__, res);
 
 }
 EXPORT_SYMBOL(sas_port_mark_backlink);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 0c63947d8a9d..e5e7d7856454 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -99,8 +99,7 @@ static void scsi_disk_release(struct device *cdev);
 static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
 static void sd_print_result(struct scsi_disk *, int);
 
-static DEFINE_IDR(sd_index_idr);
-static DEFINE_SPINLOCK(sd_index_lock);
+static DEFINE_IDA(sd_index_ida);
 
 /* This semaphore is used to mediate the 0->1 reference get in the
  * face of object destruction (i.e. we can't allow a get on an
@@ -234,6 +233,24 @@ sd_show_allow_restart(struct device *dev, struct device_attribute *attr,
         return snprintf(buf, 40, "%d\n", sdkp->device->allow_restart);
 }
 
+static ssize_t
+sd_show_protection_type(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct scsi_disk *sdkp = to_scsi_disk(dev);
+
+        return snprintf(buf, 20, "%u\n", sdkp->protection_type);
+}
+
+static ssize_t
+sd_show_app_tag_own(struct device *dev, struct device_attribute *attr,
+                    char *buf)
+{
+        struct scsi_disk *sdkp = to_scsi_disk(dev);
+
+        return snprintf(buf, 20, "%u\n", sdkp->ATO);
+}
+
 static struct device_attribute sd_disk_attrs[] = {
         __ATTR(cache_type, S_IRUGO|S_IWUSR, sd_show_cache_type,
                sd_store_cache_type),
@@ -242,6 +259,8 @@ static struct device_attribute sd_disk_attrs[] = {
                sd_store_allow_restart),
         __ATTR(manage_start_stop, S_IRUGO|S_IWUSR, sd_show_manage_start_stop,
                sd_store_manage_start_stop),
+        __ATTR(protection_type, S_IRUGO, sd_show_protection_type, NULL),
+        __ATTR(app_tag_own, S_IRUGO, sd_show_app_tag_own, NULL),
         __ATTR_NULL,
 };
 
@@ -354,7 +373,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         struct scsi_cmnd *SCpnt;
         struct scsi_device *sdp = q->queuedata;
         struct gendisk *disk = rq->rq_disk;
+        struct scsi_disk *sdkp;
         sector_t block = rq->sector;
+        sector_t threshold;
         unsigned int this_count = rq->nr_sectors;
         unsigned int timeout = sdp->timeout;
         int ret;
@@ -370,6 +391,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         if (ret != BLKPREP_OK)
                 goto out;
         SCpnt = rq->special;
+        sdkp = scsi_disk(disk);
 
         /* from here on until we're complete, any goto out
          * is used for a killable error condition */
@@ -401,13 +423,21 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         }
 
         /*
-         * Some devices (some sdcards for one) don't like it if the
-         * last sector gets read in a larger then 1 sector read.
+         * Some SD card readers can't handle multi-sector accesses which touch
+         * the last one or two hardware sectors.  Split accesses as needed.
          */
-        if (unlikely(sdp->last_sector_bug &&
-            rq->nr_sectors > sdp->sector_size / 512 &&
-            block + this_count == get_capacity(disk)))
-                this_count -= sdp->sector_size / 512;
+        threshold = get_capacity(disk) - SD_LAST_BUGGY_SECTORS *
+                (sdp->sector_size / 512);
+
+        if (unlikely(sdp->last_sector_bug && block + this_count > threshold)) {
+                if (block < threshold) {
+                        /* Access up to the threshold but not beyond */
+                        this_count = threshold - block;
+                } else {
+                        /* Access only a single hardware sector */
+                        this_count = sdp->sector_size / 512;
+                }
+        }
 
         SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt, "block=%llu\n",
                                         (unsigned long long)block));
@@ -459,6 +489,11 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                 }
                 SCpnt->cmnd[0] = WRITE_6;
                 SCpnt->sc_data_direction = DMA_TO_DEVICE;
+
+                if (blk_integrity_rq(rq) &&
+                    sd_dif_prepare(rq, block, sdp->sector_size) == -EIO)
+                        goto out;
+
         } else if (rq_data_dir(rq) == READ) {
                 SCpnt->cmnd[0] = READ_6;
                 SCpnt->sc_data_direction = DMA_FROM_DEVICE;
@@ -473,8 +508,12 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                                         "writing" : "reading", this_count,
                                         rq->nr_sectors));
 
-        SCpnt->cmnd[1] = 0;
-        
+        /* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */
+        if (scsi_host_dif_capable(sdp->host, sdkp->protection_type))
+                SCpnt->cmnd[1] = 1 << 5;
+        else
+                SCpnt->cmnd[1] = 0;
+
         if (block > 0xffffffff) {
                 SCpnt->cmnd[0] += READ_16 - READ_6;
                 SCpnt->cmnd[1] |= blk_fua_rq(rq) ? 0x8 : 0;
@@ -492,6 +531,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                 SCpnt->cmnd[13] = (unsigned char) this_count & 0xff;
                 SCpnt->cmnd[14] = SCpnt->cmnd[15] = 0;
         } else if ((this_count > 0xff) || (block > 0x1fffff) ||
+                   scsi_device_protection(SCpnt->device) ||
                    SCpnt->device->use_10_for_rw) {
                 if (this_count > 0xffff)
                         this_count = 0xffff;
@@ -526,6 +566,10 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         }
         SCpnt->sdb.length = this_count * sdp->sector_size;
 
+        /* If DIF or DIX is enabled, tell HBA how to handle request */
+        if (sdkp->protection_type || scsi_prot_sg_count(SCpnt))
+                sd_dif_op(SCpnt, sdkp->protection_type, scsi_prot_sg_count(SCpnt));
+
         /*
          * We shouldn't disconnect in the middle of a sector, so with a dumb
          * host adapter, it's safe to assume that we can at least transfer
@@ -920,6 +964,48 @@ static struct block_device_operations sd_fops = {
         .revalidate_disk        = sd_revalidate_disk,
 };
 
+static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
+{
+        u64 start_lba = scmd->request->sector;
+        u64 end_lba = scmd->request->sector + (scsi_bufflen(scmd) / 512);
+        u64 bad_lba;
+        int info_valid;
+
+        if (!blk_fs_request(scmd->request))
+                return 0;
+
+        info_valid = scsi_get_sense_info_fld(scmd->sense_buffer,
+                                             SCSI_SENSE_BUFFERSIZE,
+                                             &bad_lba);
+        if (!info_valid)
+                return 0;
+
+        if (scsi_bufflen(scmd) <= scmd->device->sector_size)
+                return 0;
+
+        if (scmd->device->sector_size < 512) {
+                /* only legitimate sector_size here is 256 */
+                start_lba <<= 1;
+                end_lba <<= 1;
+        } else {
+                /* be careful ... don't want any overflows */
+                u64 factor = scmd->device->sector_size / 512;
+                do_div(start_lba, factor);
+                do_div(end_lba, factor);
+        }
+
+        /* The bad lba was reported incorrectly, we have no idea where
+         * the error is.
+         */
+        if (bad_lba < start_lba  || bad_lba >= end_lba)
+                return 0;
+
+        /* This computation should always be done in terms of
+         * the resolution of the device's medium.
+         */
+        return (bad_lba - start_lba) * scmd->device->sector_size;
+}
+
 /**
  *      sd_done - bottom half handler: called when the lower level
  *      driver has completed (successfully or otherwise) a scsi command.
@@ -930,15 +1016,10 @@ static struct block_device_operations sd_fops = {
 static int sd_done(struct scsi_cmnd *SCpnt)
 {
         int result = SCpnt->result;
-        unsigned int xfer_size = scsi_bufflen(SCpnt);
-        unsigned int good_bytes = result ? 0 : xfer_size;
-        u64 start_lba = SCpnt->request->sector;
-        u64 end_lba = SCpnt->request->sector + (xfer_size / 512);
-        u64 bad_lba;
+        unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
         struct scsi_sense_hdr sshdr;
         int sense_valid = 0;
         int sense_deferred = 0;
-        int info_valid;
 
         if (result) {
                 sense_valid = scsi_command_normalize_sense(SCpnt, &sshdr);
@@ -963,36 +1044,7 @@ static int sd_done(struct scsi_cmnd *SCpnt)
         switch (sshdr.sense_key) {
         case HARDWARE_ERROR:
         case MEDIUM_ERROR:
-                if (!blk_fs_request(SCpnt->request))
-                        goto out;
-                info_valid = scsi_get_sense_info_fld(SCpnt->sense_buffer,
-                                                     SCSI_SENSE_BUFFERSIZE,
-                                                     &bad_lba);
-                if (!info_valid)
-                        goto out;
-                if (xfer_size <= SCpnt->device->sector_size)
-                        goto out;
-                if (SCpnt->device->sector_size < 512) {
-                        /* only legitimate sector_size here is 256 */
-                        start_lba <<= 1;
-                        end_lba <<= 1;
-                } else {
-                        /* be careful ... don't want any overflows */
-                        u64 factor = SCpnt->device->sector_size / 512;
-                        do_div(start_lba, factor);
-                        do_div(end_lba, factor);
-                }
-
-                if (bad_lba < start_lba  || bad_lba >= end_lba)
-                        /* the bad lba was reported incorrectly, we have
-                         * no idea where the error is
-                         */
-                        goto out;
-
-                /* This computation should always be done in terms of
-                 * the resolution of the device's medium.
-                 */
-                good_bytes = (bad_lba - start_lba)*SCpnt->device->sector_size;
+                good_bytes = sd_completed_bytes(SCpnt);
                 break;
         case RECOVERED_ERROR:
         case NO_SENSE:
@@ -1002,10 +1054,23 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 scsi_print_sense("sd", SCpnt);
                 SCpnt->result = 0;
                 memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
-                good_bytes = xfer_size;
+                good_bytes = scsi_bufflen(SCpnt);
+                break;
+        case ABORTED_COMMAND:
+                if (sshdr.asc == 0x10) { /* DIF: Disk detected corruption */
+                        scsi_print_result(SCpnt);
+                        scsi_print_sense("sd", SCpnt);
+                        good_bytes = sd_completed_bytes(SCpnt);
+                }
                 break;
         case ILLEGAL_REQUEST:
-                if (SCpnt->device->use_10_for_rw &&
+                if (sshdr.asc == 0x10) { /* DIX: HBA detected corruption */
+                        scsi_print_result(SCpnt);
+                        scsi_print_sense("sd", SCpnt);
+                        good_bytes = sd_completed_bytes(SCpnt);
+                }
+                if (!scsi_device_protection(SCpnt->device) &&
+                    SCpnt->device->use_10_for_rw &&
                     (SCpnt->cmnd[0] == READ_10 ||
                      SCpnt->cmnd[0] == WRITE_10))
                         SCpnt->device->use_10_for_rw = 0;
@@ -1018,6 +1083,9 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 break;
         }
  out:
+        if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
+                sd_dif_complete(SCpnt, good_bytes);
+
         return good_bytes;
 }
 
@@ -1165,6 +1233,49 @@ sd_spinup_disk(struct scsi_disk *sdkp)
         }
 }
 
+
+/*
+ * Determine whether disk supports Data Integrity Field.
+ */
+void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
+{
+        struct scsi_device *sdp = sdkp->device;
+        u8 type;
+
+        if (scsi_device_protection(sdp) == 0 || (buffer[12] & 1) == 0)
+                type = 0;
+        else
+                type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
+
+        switch (type) {
+        case SD_DIF_TYPE0_PROTECTION:
+                sdkp->protection_type = 0;
+                break;
+
+        case SD_DIF_TYPE1_PROTECTION:
+        case SD_DIF_TYPE3_PROTECTION:
+                sdkp->protection_type = type;
+                break;
+
+        case SD_DIF_TYPE2_PROTECTION:
+                sd_printk(KERN_ERR, sdkp, "formatted with DIF Type 2 "  \
+                          "protection which is currently unsupported. " \
+                          "Disabling disk!\n");
+                goto disable;
+
+        default:
+                sd_printk(KERN_ERR, sdkp, "formatted with unknown "     \
+                          "protection type %d. Disabling disk!\n", type);
+                goto disable;
+        }
+
+        return;
+
+disable:
+        sdkp->protection_type = 0;
+        sdkp->capacity = 0;
+}
+
 /*
  * read disk capacity
  */
@@ -1174,7 +1285,8 @@ sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
         unsigned char cmd[16];
         int the_result, retries;
         int sector_size = 0;
-        int longrc = 0;
+        /* Force READ CAPACITY(16) when PROTECT=1 */
+        int longrc = scsi_device_protection(sdkp->device) ? 1 : 0;
         struct scsi_sense_hdr sshdr;
         int sense_valid = 0;
         struct scsi_device *sdp = sdkp->device;
@@ -1186,8 +1298,8 @@ repeat:
                         memset((void *) cmd, 0, 16);
                         cmd[0] = SERVICE_ACTION_IN;
                         cmd[1] = SAI_READ_CAPACITY_16;
-                        cmd[13] = 12;
-                        memset((void *) buffer, 0, 12);
+                        cmd[13] = 13;
+                        memset((void *) buffer, 0, 13);
                 } else {
                         cmd[0] = READ_CAPACITY;
                         memset((void *) &cmd[1], 0, 9);
@@ -1195,7 +1307,7 @@ repeat:
                 }
                 
                 the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
-                                              buffer, longrc ? 12 : 8, &sshdr,
+                                              buffer, longrc ? 13 : 8, &sshdr,
                                               SD_TIMEOUT, SD_MAX_RETRIES);
 
                 if (media_not_present(sdkp, &sshdr))
@@ -1270,6 +1382,8 @@ repeat:
                         
                 sector_size = (buffer[8] << 24) |
                         (buffer[9] << 16) | (buffer[10] << 8) | buffer[11];
+
+                sd_read_protection_type(sdkp, buffer);
         }       
 
         /* Some devices return the total number of sectors, not the
@@ -1531,6 +1645,52 @@ defaults:
         sdkp->DPOFUA = 0;
 }
 
+/*
+ * The ATO bit indicates whether the DIF application tag is available
+ * for use by the operating system.
+ */
+void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
+{
+        int res, offset;
+        struct scsi_device *sdp = sdkp->device;
+        struct scsi_mode_data data;
+        struct scsi_sense_hdr sshdr;
+
+        if (sdp->type != TYPE_DISK)
+                return;
+
+        if (sdkp->protection_type == 0)
+                return;
+
+        res = scsi_mode_sense(sdp, 1, 0x0a, buffer, 36, SD_TIMEOUT,
+                              SD_MAX_RETRIES, &data, &sshdr);
+
+        if (!scsi_status_is_good(res) || !data.header_length ||
+            data.length < 6) {
+                sd_printk(KERN_WARNING, sdkp,
+                          "getting Control mode page failed, assume no ATO\n");
+
+                if (scsi_sense_valid(&sshdr))
+                        sd_print_sense_hdr(sdkp, &sshdr);
+
+                return;
+        }
+
+        offset = data.header_length + data.block_descriptor_length;
+
+        if ((buffer[offset] & 0x3f) != 0x0a) {
+                sd_printk(KERN_ERR, sdkp, "ATO Got wrong page\n");
+                return;
+        }
+
+        if ((buffer[offset + 5] & 0x80) == 0)
+                return;
+
+        sdkp->ATO = 1;
+
+        return;
+}
+
 /**
  *      sd_revalidate_disk - called the first time a new disk is seen,
  *      performs disk spin up, read_capacity, etc.
@@ -1567,6 +1727,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         sdkp->write_prot = 0;
         sdkp->WCE = 0;
         sdkp->RCD = 0;
+        sdkp->ATO = 0;
 
         sd_spinup_disk(sdkp);
 
@@ -1578,6 +1739,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
                 sd_read_capacity(sdkp, buffer);
                 sd_read_write_protect_flag(sdkp, buffer);
                 sd_read_cache_type(sdkp, buffer);
+                sd_read_app_tag_own(sdkp, buffer);
         }
 
         /*
@@ -1643,18 +1805,20 @@ static int sd_probe(struct device *dev)
         if (!gd)
                 goto out_free;
 
-        if (!idr_pre_get(&sd_index_idr, GFP_KERNEL))
-                goto out_put;
+        do {
+                if (!ida_pre_get(&sd_index_ida, GFP_KERNEL))
+                        goto out_put;
 
-        spin_lock(&sd_index_lock);
-        error = idr_get_new(&sd_index_idr, NULL, &index);
-        spin_unlock(&sd_index_lock);
+                error = ida_get_new(&sd_index_ida, &index);
+        } while (error == -EAGAIN);
 
-        if (index >= SD_MAX_DISKS)
-                error = -EBUSY;
         if (error)
                 goto out_put;
 
+        error = -EBUSY;
+        if (index >= SD_MAX_DISKS)
+                goto out_free_index;
+
         sdkp->device = sdp;
         sdkp->driver = &sd_template;
         sdkp->disk = gd;
@@ -1675,7 +1839,7 @@ static int sd_probe(struct device *dev)
         strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
 
         if (device_add(&sdkp->dev))
-                goto out_put;
+                goto out_free_index;
 
         get_device(&sdp->sdev_gendev);
 
@@ -1711,12 +1875,15 @@ static int sd_probe(struct device *dev)
 
         dev_set_drvdata(dev, sdkp);
         add_disk(gd);
+        sd_dif_config_host(sdkp);
 
         sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
                   sdp->removable ? "removable " : "");
 
         return 0;
 
+ out_free_index:
+        ida_remove(&sd_index_ida, index);
  out_put:
         put_disk(gd);
  out_free:
@@ -1766,9 +1933,7 @@ static void scsi_disk_release(struct device *dev)
         struct scsi_disk *sdkp = to_scsi_disk(dev);
         struct gendisk *disk = sdkp->disk;
         
-        spin_lock(&sd_index_lock);
-        idr_remove(&sd_index_idr, sdkp->index);
-        spin_unlock(&sd_index_lock);
+        ida_remove(&sd_index_ida, sdkp->index);
 
         disk->private_data = NULL;
         put_disk(disk);
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 03a3d45cfa42..95b9f06534d5 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -31,6 +31,12 @@
  */
 #define SD_BUF_SIZE             512
 
+/*
+ * Number of sectors at the end of the device to avoid multi-sector
+ * accesses to in the case of last_sector_bug
+ */
+#define SD_LAST_BUGGY_SECTORS   8
+
 struct scsi_disk {
         struct scsi_driver *driver;     /* always &sd_template */
         struct scsi_device *device;
@@ -41,7 +47,9 @@ struct scsi_disk {
         u32             index;
         u8              media_present;
         u8              write_prot;
+        u8              protection_type;/* Data Integrity Field */
         unsigned        previous_state : 1;
+        unsigned        ATO : 1;        /* state of disk ATO bit */
         unsigned        WCE : 1;        /* state of disk WCE bit */
         unsigned        RCD : 1;        /* state of disk RCD bit, unused */
         unsigned        DPOFUA : 1;     /* state of disk DPOFUA bit */
@@ -59,4 +67,50 @@ static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
                     (sdsk)->disk->disk_name, ##a) :                     \
         sdev_printk(prefix, (sdsk)->device, fmt, ##a)
 
+/*
+ * A DIF-capable target device can be formatted with different
+ * protection schemes.  Currently 0 through 3 are defined:
+ *
+ * Type 0 is regular (unprotected) I/O
+ *
+ * Type 1 defines the contents of the guard and reference tags
+ *
+ * Type 2 defines the contents of the guard and reference tags and
+ * uses 32-byte commands to seed the latter
+ *
+ * Type 3 defines the contents of the guard tag only
+ */
+
+enum sd_dif_target_protection_types {
+        SD_DIF_TYPE0_PROTECTION = 0x0,
+        SD_DIF_TYPE1_PROTECTION = 0x1,
+        SD_DIF_TYPE2_PROTECTION = 0x2,
+        SD_DIF_TYPE3_PROTECTION = 0x3,
+};
+
+/*
+ * Data Integrity Field tuple.
+ */
+struct sd_dif_tuple {
+       __be16 guard_tag;        /* Checksum */
+       __be16 app_tag;          /* Opaque storage */
+       __be32 ref_tag;          /* Target LBA or indirect LBA */
+};
+
+#if defined(CONFIG_BLK_DEV_INTEGRITY)
+
+extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int);
+extern void sd_dif_config_host(struct scsi_disk *);
+extern int sd_dif_prepare(struct request *rq, sector_t, unsigned int);
+extern void sd_dif_complete(struct scsi_cmnd *, unsigned int);
+
+#else /* CONFIG_BLK_DEV_INTEGRITY */
+
+#define sd_dif_op(a, b, c)                      do { } while (0)
+#define sd_dif_config_host(a)                   do { } while (0)
+#define sd_dif_prepare(a, b, c)                 (0)
+#define sd_dif_complete(a, b)                   (0)
+
+#endif /* CONFIG_BLK_DEV_INTEGRITY */
+
 #endif /* _SCSI_DISK_H */
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
new file mode 100644
index 000000000000..4d17f3d35aac
--- /dev/null
+++ b/drivers/scsi/sd_dif.c
@@ -0,0 +1,538 @@
+/*
+ * sd_dif.c - SCSI Data Integrity Field
+ *
+ * Copyright (C) 2007, 2008 Oracle Corporation
+ * Written by: Martin K. Petersen <martin.petersen@oracle.com>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
+ * USA.
+ *
+ */
+
+#include <linux/blkdev.h>
+#include <linux/crc-t10dif.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_driver.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_ioctl.h>
+#include <scsi/scsicam.h>
+
+#include <net/checksum.h>
+
+#include "sd.h"
+
+typedef __u16 (csum_fn) (void *, unsigned int);
+
+static __u16 sd_dif_crc_fn(void *data, unsigned int len)
+{
+        return cpu_to_be16(crc_t10dif(data, len));
+}
+
+static __u16 sd_dif_ip_fn(void *data, unsigned int len)
+{
+        return ip_compute_csum(data, len);
+}
+
+/*
+ * Type 1 and Type 2 protection use the same format: 16 bit guard tag,
+ * 16 bit app tag, 32 bit reference tag.
+ */
+static void sd_dif_type1_generate(struct blk_integrity_exchg *bix, csum_fn *fn)
+{
+        void *buf = bix->data_buf;
+        struct sd_dif_tuple *sdt = bix->prot_buf;
+        sector_t sector = bix->sector;
+        unsigned int i;
+
+        for (i = 0 ; i < bix->data_size ; i += bix->sector_size, sdt++) {
+                sdt->guard_tag = fn(buf, bix->sector_size);
+                sdt->ref_tag = cpu_to_be32(sector & 0xffffffff);
+                sdt->app_tag = 0;
+
+                buf += bix->sector_size;
+                sector++;
+        }
+}
+
+static void sd_dif_type1_generate_crc(struct blk_integrity_exchg *bix)
+{
+        sd_dif_type1_generate(bix, sd_dif_crc_fn);
+}
+
+static void sd_dif_type1_generate_ip(struct blk_integrity_exchg *bix)
+{
+        sd_dif_type1_generate(bix, sd_dif_ip_fn);
+}
+
+static int sd_dif_type1_verify(struct blk_integrity_exchg *bix, csum_fn *fn)
+{
+        void *buf = bix->data_buf;
+        struct sd_dif_tuple *sdt = bix->prot_buf;
+        sector_t sector = bix->sector;
+        unsigned int i;
+        __u16 csum;
+
+        for (i = 0 ; i < bix->data_size ; i += bix->sector_size, sdt++) {
+                /* Unwritten sectors */
+                if (sdt->app_tag == 0xffff)
+                        return 0;
+
+                /* Bad ref tag received from disk */
+                if (sdt->ref_tag == 0xffffffff) {
+                        printk(KERN_ERR
+                               "%s: bad phys ref tag on sector %lu\n",
+                               bix->disk_name, (unsigned long)sector);
+                        return -EIO;
+                }
+
+                if (be32_to_cpu(sdt->ref_tag) != (sector & 0xffffffff)) {
+                        printk(KERN_ERR
+                               "%s: ref tag error on sector %lu (rcvd %u)\n",
+                               bix->disk_name, (unsigned long)sector,
+                               be32_to_cpu(sdt->ref_tag));
+                        return -EIO;
+                }
+
+                csum = fn(buf, bix->sector_size);
+
+                if (sdt->guard_tag != csum) {
+                        printk(KERN_ERR "%s: guard tag error on sector %lu " \
+                               "(rcvd %04x, data %04x)\n", bix->disk_name,
+                               (unsigned long)sector,
+                               be16_to_cpu(sdt->guard_tag), be16_to_cpu(csum));
+                        return -EIO;
+                }
+
+                buf += bix->sector_size;
+                sector++;
+        }
+
+        return 0;
+}
+
+static int sd_dif_type1_verify_crc(struct blk_integrity_exchg *bix)
+{
+        return sd_dif_type1_verify(bix, sd_dif_crc_fn);
+}
+
+static int sd_dif_type1_verify_ip(struct blk_integrity_exchg *bix)
+{
+        return sd_dif_type1_verify(bix, sd_dif_ip_fn);
+}
+
+/*
+ * Functions for interleaving and deinterleaving application tags
+ */
+static void sd_dif_type1_set_tag(void *prot, void *tag_buf, unsigned int sectors)
+{
+        struct sd_dif_tuple *sdt = prot;
+        char *tag = tag_buf;
+        unsigned int i, j;
+
+        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
+                sdt->app_tag = tag[j] << 8 | tag[j+1];
+                BUG_ON(sdt->app_tag == 0xffff);
+        }
+}
+
+static void sd_dif_type1_get_tag(void *prot, void *tag_buf, unsigned int sectors)
+{
+        struct sd_dif_tuple *sdt = prot;
+        char *tag = tag_buf;
+        unsigned int i, j;
+
+        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
+                tag[j] = (sdt->app_tag & 0xff00) >> 8;
+                tag[j+1] = sdt->app_tag & 0xff;
+        }
+}
+
+static struct blk_integrity dif_type1_integrity_crc = {
+        .name                   = "T10-DIF-TYPE1-CRC",
+        .generate_fn            = sd_dif_type1_generate_crc,
+        .verify_fn              = sd_dif_type1_verify_crc,
+        .get_tag_fn             = sd_dif_type1_get_tag,
+        .set_tag_fn             = sd_dif_type1_set_tag,
+        .tuple_size             = sizeof(struct sd_dif_tuple),
+        .tag_size               = 0,
+};
+
+static struct blk_integrity dif_type1_integrity_ip = {
+        .name                   = "T10-DIF-TYPE1-IP",
+        .generate_fn            = sd_dif_type1_generate_ip,
+        .verify_fn              = sd_dif_type1_verify_ip,
+        .get_tag_fn             = sd_dif_type1_get_tag,
+        .set_tag_fn             = sd_dif_type1_set_tag,
+        .tuple_size             = sizeof(struct sd_dif_tuple),
+        .tag_size               = 0,
+};
+
+
+/*
+ * Type 3 protection has a 16-bit guard tag and 16 + 32 bits of opaque
+ * tag space.
+ */
+static void sd_dif_type3_generate(struct blk_integrity_exchg *bix, csum_fn *fn)
+{
+        void *buf = bix->data_buf;
+        struct sd_dif_tuple *sdt = bix->prot_buf;
+        unsigned int i;
+
+        for (i = 0 ; i < bix->data_size ; i += bix->sector_size, sdt++) {
+                sdt->guard_tag = fn(buf, bix->sector_size);
+                sdt->ref_tag = 0;
+                sdt->app_tag = 0;
+
+                buf += bix->sector_size;
+        }
+}
+
+static void sd_dif_type3_generate_crc(struct blk_integrity_exchg *bix)
+{
+        sd_dif_type3_generate(bix, sd_dif_crc_fn);
+}
+
+static void sd_dif_type3_generate_ip(struct blk_integrity_exchg *bix)
+{
+        sd_dif_type3_generate(bix, sd_dif_ip_fn);
+}
+
+static int sd_dif_type3_verify(struct blk_integrity_exchg *bix, csum_fn *fn)
+{
+        void *buf = bix->data_buf;
+        struct sd_dif_tuple *sdt = bix->prot_buf;
+        sector_t sector = bix->sector;
+        unsigned int i;
+        __u16 csum;
+
+        for (i = 0 ; i < bix->data_size ; i += bix->sector_size, sdt++) {
+                /* Unwritten sectors */
+                if (sdt->app_tag == 0xffff && sdt->ref_tag == 0xffffffff)
+                        return 0;
+
+                csum = fn(buf, bix->sector_size);
+
+                if (sdt->guard_tag != csum) {
+                        printk(KERN_ERR "%s: guard tag error on sector %lu " \
+                               "(rcvd %04x, data %04x)\n", bix->disk_name,
+                               (unsigned long)sector,
+                               be16_to_cpu(sdt->guard_tag), be16_to_cpu(csum));
+                        return -EIO;
+                }
+
+                buf += bix->sector_size;
+                sector++;
+        }
+
+        return 0;
+}
+
+static int sd_dif_type3_verify_crc(struct blk_integrity_exchg *bix)
+{
+        return sd_dif_type3_verify(bix, sd_dif_crc_fn);
+}
+
+static int sd_dif_type3_verify_ip(struct blk_integrity_exchg *bix)
+{
+        return sd_dif_type3_verify(bix, sd_dif_ip_fn);
+}
+
+static void sd_dif_type3_set_tag(void *prot, void *tag_buf, unsigned int sectors)
+{
+        struct sd_dif_tuple *sdt = prot;
+        char *tag = tag_buf;
+        unsigned int i, j;
+
+        for (i = 0, j = 0 ; i < sectors ; i++, j += 6, sdt++) {
+                sdt->app_tag = tag[j] << 8 | tag[j+1];
+                sdt->ref_tag = tag[j+2] << 24 | tag[j+3] << 16 |
+                        tag[j+4] << 8 | tag[j+5];
+        }
+}
+
+static void sd_dif_type3_get_tag(void *prot, void *tag_buf, unsigned int sectors)
+{
+        struct sd_dif_tuple *sdt = prot;
+        char *tag = tag_buf;
+        unsigned int i, j;
+
+        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
+                tag[j] = (sdt->app_tag & 0xff00) >> 8;
+                tag[j+1] = sdt->app_tag & 0xff;
+                tag[j+2] = (sdt->ref_tag & 0xff000000) >> 24;
+                tag[j+3] = (sdt->ref_tag & 0xff0000) >> 16;
+                tag[j+4] = (sdt->ref_tag & 0xff00) >> 8;
+                tag[j+5] = sdt->ref_tag & 0xff;
+                BUG_ON(sdt->app_tag == 0xffff || sdt->ref_tag == 0xffffffff);
+        }
+}
+
+static struct blk_integrity dif_type3_integrity_crc = {
+        .name                   = "T10-DIF-TYPE3-CRC",
+        .generate_fn            = sd_dif_type3_generate_crc,
+        .verify_fn              = sd_dif_type3_verify_crc,
+        .get_tag_fn             = sd_dif_type3_get_tag,
+        .set_tag_fn             = sd_dif_type3_set_tag,
+        .tuple_size             = sizeof(struct sd_dif_tuple),
+        .tag_size               = 0,
+};
+
+static struct blk_integrity dif_type3_integrity_ip = {
+        .name                   = "T10-DIF-TYPE3-IP",
+        .generate_fn            = sd_dif_type3_generate_ip,
+        .verify_fn              = sd_dif_type3_verify_ip,
+        .get_tag_fn             = sd_dif_type3_get_tag,
+        .set_tag_fn             = sd_dif_type3_set_tag,
+        .tuple_size             = sizeof(struct sd_dif_tuple),
+        .tag_size               = 0,
+};
+
+/*
+ * Configure exchange of protection information between OS and HBA.
+ */
+void sd_dif_config_host(struct scsi_disk *sdkp)
+{
+        struct scsi_device *sdp = sdkp->device;
+        struct gendisk *disk = sdkp->disk;
+        u8 type = sdkp->protection_type;
+
+        /* If this HBA doesn't support DIX, resort to normal I/O or DIF */
+        if (scsi_host_dix_capable(sdp->host, type) == 0) {
+
+                if (type == SD_DIF_TYPE0_PROTECTION)
+                        return;
+
+                if (scsi_host_dif_capable(sdp->host, type) == 0) {
+                        sd_printk(KERN_INFO, sdkp, "Type %d protection " \
+                                  "unsupported by HBA. Disabling DIF.\n", type);
+                        sdkp->protection_type = 0;
+                        return;
+                }
+
+                sd_printk(KERN_INFO, sdkp, "Enabling DIF Type %d protection\n",
+                          type);
+
+                return;
+        }
+
+        /* Enable DMA of protection information */
+        if (scsi_host_get_guard(sdkp->device->host) & SHOST_DIX_GUARD_IP)
+                if (type == SD_DIF_TYPE3_PROTECTION)
+                        blk_integrity_register(disk, &dif_type3_integrity_ip);
+                else
+                        blk_integrity_register(disk, &dif_type1_integrity_ip);
+        else
+                if (type == SD_DIF_TYPE3_PROTECTION)
+                        blk_integrity_register(disk, &dif_type3_integrity_crc);
+                else
+                        blk_integrity_register(disk, &dif_type1_integrity_crc);
+
+        sd_printk(KERN_INFO, sdkp,
+                  "Enabling %s integrity protection\n", disk->integrity->name);
+
+        /* Signal to block layer that we support sector tagging */
+        if (type && sdkp->ATO) {
+                if (type == SD_DIF_TYPE3_PROTECTION)
+                        disk->integrity->tag_size = sizeof(u16) + sizeof(u32);
+                else
+                        disk->integrity->tag_size = sizeof(u16);
+
+                sd_printk(KERN_INFO, sdkp, "DIF application tag size %u\n",
+                          disk->integrity->tag_size);
+        }
+}
+
+/*
+ * DIF DMA operation magic decoder ring.
+ */
+void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
+{
+        int csum_convert, prot_op;
+
+        prot_op = 0;
+
+        /* Convert checksum? */
+        if (scsi_host_get_guard(scmd->device->host) != SHOST_DIX_GUARD_CRC)
+                csum_convert = 1;
+        else
+                csum_convert = 0;
+
+        switch (scmd->cmnd[0]) {
+        case READ_10:
+        case READ_12:
+        case READ_16:
+                if (dif && dix)
+                        if (csum_convert)
+                                prot_op = SCSI_PROT_READ_CONVERT;
+                        else
+                                prot_op = SCSI_PROT_READ_PASS;
+                else if (dif && !dix)
+                        prot_op = SCSI_PROT_READ_STRIP;
+                else if (!dif && dix)
+                        prot_op = SCSI_PROT_READ_INSERT;
+
+                break;
+
+        case WRITE_10:
+        case WRITE_12:
+        case WRITE_16:
+                if (dif && dix)
+                        if (csum_convert)
+                                prot_op = SCSI_PROT_WRITE_CONVERT;
+                        else
+                                prot_op = SCSI_PROT_WRITE_PASS;
+                else if (dif && !dix)
+                        prot_op = SCSI_PROT_WRITE_INSERT;
+                else if (!dif && dix)
+                        prot_op = SCSI_PROT_WRITE_STRIP;
+
+                break;
+        }
+
+        scsi_set_prot_op(scmd, prot_op);
+        scsi_set_prot_type(scmd, dif);
+}
+
+/*
+ * The virtual start sector is the one that was originally submitted
+ * by the block layer.  Due to partitioning, MD/DM cloning, etc. the
+ * actual physical start sector is likely to be different.  Remap
+ * protection information to match the physical LBA.
+ *
+ * From a protocol perspective there's a slight difference between
+ * Type 1 and 2.  The latter uses 32-byte CDBs exclusively, and the
+ * reference tag is seeded in the CDB.  This gives us the potential to
+ * avoid virt->phys remapping during write.  However, at read time we
+ * don't know whether the virt sector is the same as when we wrote it
+ * (we could be reading from real disk as opposed to MD/DM device.  So
+ * we always remap Type 2 making it identical to Type 1.
+ *
+ * Type 3 does not have a reference tag so no remapping is required.
+ */
+int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_sz)
+{
+        const int tuple_sz = sizeof(struct sd_dif_tuple);
+        struct bio *bio;
+        struct scsi_disk *sdkp;
+        struct sd_dif_tuple *sdt;
+        unsigned int i, j;
+        u32 phys, virt;
+
+        /* Already remapped? */
+        if (rq->cmd_flags & REQ_INTEGRITY)
+                return 0;
+
+        sdkp = rq->bio->bi_bdev->bd_disk->private_data;
+
+        if (sdkp->protection_type == SD_DIF_TYPE3_PROTECTION)
+                return 0;
+
+        rq->cmd_flags |= REQ_INTEGRITY;
+        phys = hw_sector & 0xffffffff;
+
+        __rq_for_each_bio(bio, rq) {
+                struct bio_vec *iv;
+
+                virt = bio->bi_integrity->bip_sector & 0xffffffff;
+
+                bip_for_each_vec(iv, bio->bi_integrity, i) {
+                        sdt = kmap_atomic(iv->bv_page, KM_USER0)
+                                + iv->bv_offset;
+
+                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
+
+                                if (be32_to_cpu(sdt->ref_tag) != virt)
+                                        goto error;
+
+                                sdt->ref_tag = cpu_to_be32(phys);
+                                virt++;
+                                phys++;
+                        }
+
+                        kunmap_atomic(sdt, KM_USER0);
+                }
+        }
+
+        return 0;
+
+error:
+        kunmap_atomic(sdt, KM_USER0);
+        sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u\n",
+                  __func__, virt, phys, be32_to_cpu(sdt->ref_tag));
+
+        return -EIO;
+}
+
+/*
+ * Remap physical sector values in the reference tag to the virtual
+ * values expected by the block layer.
+ */
+void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
+{
+        const int tuple_sz = sizeof(struct sd_dif_tuple);
+        struct scsi_disk *sdkp;
+        struct bio *bio;
+        struct sd_dif_tuple *sdt;
+        unsigned int i, j, sectors, sector_sz;
+        u32 phys, virt;
+
+        sdkp = scsi_disk(scmd->request->rq_disk);
+
+        if (sdkp->protection_type == SD_DIF_TYPE3_PROTECTION || good_bytes == 0)
+                return;
+
+        sector_sz = scmd->device->sector_size;
+        sectors = good_bytes / sector_sz;
+
+        phys = scmd->request->sector & 0xffffffff;
+        if (sector_sz == 4096)
+                phys >>= 3;
+
+        __rq_for_each_bio(bio, scmd->request) {
+                struct bio_vec *iv;
+
+                virt = bio->bi_integrity->bip_sector & 0xffffffff;
+
+                bip_for_each_vec(iv, bio->bi_integrity, i) {
+                        sdt = kmap_atomic(iv->bv_page, KM_USER0)
+                                + iv->bv_offset;
+
+                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
+
+                                if (sectors == 0) {
+                                        kunmap_atomic(sdt, KM_USER0);
+                                        return;
+                                }
+
+                                if (be32_to_cpu(sdt->ref_tag) != phys &&
+                                    sdt->app_tag != 0xffff)
+                                        sdt->ref_tag = 0xffffffff; /* Bad ref */
+                                else
+                                        sdt->ref_tag = cpu_to_be32(virt);
+
+                                virt++;
+                                phys++;
+                                sectors--;
+                        }
+
+                        kunmap_atomic(sdt, KM_USER0);
+                }
+        }
+}
+
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 4684cc716aa4..c2bb53e3d941 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static const char *verstr = "20080224";
+static const char *verstr = "20080504";
 
 #include <linux/module.h>
 
@@ -631,7 +631,7 @@ static int cross_eof(struct scsi_tape * STp, int forward)
 /* Flush the write buffer (never need to write if variable blocksize). */
 static int st_flush_write_buffer(struct scsi_tape * STp)
 {
-        int offset, transfer, blks;
+        int transfer, blks;
         int result;
         unsigned char cmd[MAX_COMMAND_SIZE];
         struct st_request *SRpnt;
@@ -644,14 +644,10 @@ static int st_flush_write_buffer(struct scsi_tape * STp)
         result = 0;
         if (STp->dirty == 1) {
 
-                offset = (STp->buffer)->buffer_bytes;
-                transfer = ((offset + STp->block_size - 1) /
-                            STp->block_size) * STp->block_size;
+                transfer = STp->buffer->buffer_bytes;
                 DEBC(printk(ST_DEB_MSG "%s: Flushing %d bytes.\n",
                                tape_name(STp), transfer));
 
-                memset((STp->buffer)->b_data + offset, 0, transfer - offset);
-
                 memset(cmd, 0, MAX_COMMAND_SIZE);
                 cmd[0] = WRITE_6;
                 cmd[1] = 1;
@@ -1670,6 +1666,7 @@ st_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
                                 if (undone <= do_count) {
                                         /* Only data from this write is not written */
                                         count += undone;
+                                        b_point -= undone;
                                         do_count -= undone;
                                         if (STp->block_size)
                                                 blks = (transfer - undone) / STp->block_size;
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index f308a0308829..3790906a77d1 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -467,7 +467,7 @@ stex_slave_alloc(struct scsi_device *sdev)
         /* Cheat: usually extracted from Inquiry data */
         sdev->tagged_supported = 1;
 
-        scsi_activate_tcq(sdev, sdev->host->can_queue);
+        scsi_activate_tcq(sdev, ST_CMD_PER_LUN);
 
         return 0;
 }
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 22a6aae78699..98df1651404f 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5741,6 +5741,8 @@ void sym_hcb_free(struct sym_hcb *np)
 
         for (target = 0; target < SYM_CONF_MAX_TARGET ; target++) {
                 tp = &np->target[target];
+                if (tp->luntbl)
+                        sym_mfree_dma(tp->luntbl, 256, "LUNTBL");
 #if SYM_CONF_MAX_LUN > 1
                 kfree(tp->lunmp);
 #endif 
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 5b04ddfed26c..1723d71cbf3f 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -452,7 +452,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)
                 /* TODO: error handling */
                 if (pSRB->SGcount != 1)
                         error = 1;
-                DEBUG1(printk("%s(): Mapped sense buffer %p at %x\n", __FUNCTION__, pcmd->sense_buffer, cmdp->saved_dma_handle));
+                DEBUG1(printk("%s(): Mapped sense buffer %p at %x\n", __func__, pcmd->sense_buffer, cmdp->saved_dma_handle));
         /* Map SG list */
         } else if (scsi_sg_count(pcmd)) {
                 int nseg;
@@ -466,7 +466,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)
                 if (nseg < 0)
                         error = 1;
                 DEBUG1(printk("%s(): Mapped SG %p with %d (%d) elements\n",\
-                              __FUNCTION__, scsi_sglist(pcmd), nseg, scsi_sg_count(pcmd)));
+                              __func__, scsi_sglist(pcmd), nseg, scsi_sg_count(pcmd)));
         /* Map single segment */
         } else
                 pSRB->SGcount = 0;
@@ -483,11 +483,11 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)
 
         if (pSRB->SRBFlag) {
                 pci_unmap_sg(pdev, &pSRB->Segmentx, 1, DMA_FROM_DEVICE);
-                DEBUG1(printk("%s(): Unmapped sense buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle));
+                DEBUG1(printk("%s(): Unmapped sense buffer at %x\n", __func__, cmdp->saved_dma_handle));
         } else {
                 scsi_dma_unmap(pcmd);
                 DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n",
-                              __FUNCTION__, scsi_sglist(pcmd), scsi_sg_count(pcmd)));
+                              __func__, scsi_sglist(pcmd), scsi_sg_count(pcmd)));
         }
 }
 
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index c975c01b3a02..d4c13561f4a6 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -148,7 +148,7 @@
  *
  * 2002/10/04 - Alan Cox <alan@redhat.com>
  *
- * Use dev_id for interrupts, kill __FUNCTION__ pasting
+ * Use dev_id for interrupts, kill __func__ pasting
  * Add a lock for the scb pool, clean up all other cli/sti usage stuff
  * Use the adapter lock for the other places we had the cli's
  *
@@ -640,12 +640,12 @@ static int __init wd7000_setup(char *str)
         (void) get_options(str, ARRAY_SIZE(ints), ints);
 
         if (wd7000_card_num >= NUM_CONFIGS) {
-                printk(KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n", __func__);
                 return 0;
         }
 
         if ((ints[0] < 3) || (ints[0] > 5)) {
-                printk(KERN_ERR "%s: Error in command line!  " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Error in command line!  " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n", __func__);
         } else {
                 for (i = 0; i < NUM_IRQS; i++)
                         if (ints[1] == wd7000_irq[i])
@@ -1642,7 +1642,7 @@ static int wd7000_biosparam(struct scsi_device *sdev,
                         ip[2] = info[2];
 
                         if (info[0] == 255)
-                                printk(KERN_INFO "%s: current partition table is " "using extended translation.\n", __FUNCTION__);
+                                printk(KERN_INFO "%s: current partition table is " "using extended translation.\n", __func__);
                 }
         }
 
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 4b5f908d35c3..3c4a300494a4 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -68,11 +68,11 @@ lasi_scsi_clock(void * hpa, int defaultclock)
         if (status == PDC_RET_OK) {
                 clock = (int) pdc_result[16];
         } else {
-                printk(KERN_WARNING "%s: pdc_iodc_read returned %d\n", __FUNCTION__, status);
+                printk(KERN_WARNING "%s: pdc_iodc_read returned %d\n", __func__, status);
                 clock = defaultclock; 
         }
 
-        printk(KERN_DEBUG "%s: SCSI clock %d\n", __FUNCTION__, clock);
+        printk(KERN_DEBUG "%s: SCSI clock %d\n", __func__, clock);
         return clock;
 }
 #endif
@@ -108,13 +108,13 @@ zalon_probe(struct parisc_device *dev)
         */
         dev->irq = gsc_alloc_irq(&gsc_irq);
 
-        printk(KERN_INFO "%s: Zalon version %d, IRQ %d\n", __FUNCTION__,
+        printk(KERN_INFO "%s: Zalon version %d, IRQ %d\n", __func__,
                 zalon_vers, dev->irq);
 
         __raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, zalon + IO_MODULE_EIM);
 
         if (zalon_vers == 0)
-                printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __func__);
 
         memset(&device, 0, sizeof(struct ncr_device));
 
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 208e42ba9455..3df2aaec829f 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -410,7 +410,6 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 static inline int scif_txroom(struct uart_port *port)
@@ -422,6 +421,22 @@ static inline int scif_rxroom(struct uart_port *port)
 {
         return sci_in(port, SCRFDR) & 0xff;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
+static inline int scif_txroom(struct uart_port *port)
+{
+        if((port->mapbase == 0xffe00000) || (port->mapbase == 0xffe08000)) /* SCIF0/1*/
+                return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0xff);
+        else /* SCIF2 */
+                return SCIF2_TXROOM_MAX - (sci_in(port, SCFDR) >> 8);
+}
+
+static inline int scif_rxroom(struct uart_port *port)
+{
+        if((port->mapbase == 0xffe00000) || (port->mapbase == 0xffe08000)) /* SCIF0/1*/
+                return sci_in(port, SCRFDR) & 0xff;
+        else /* SCIF2 */
+                return sci_in(port, SCFDR) & SCIF2_RFDC_MASK;
+}
 #else
 static inline int scif_txroom(struct uart_port *port)
 {
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index eb84833233fd..cd728df6a01a 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -123,8 +123,9 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 # define SCSPTR0 0xffe00024 /* 16 bit SCIF */
 # define SCSPTR1 0xffe08024 /* 16 bit SCIF */
+# define SCSPTR2 0xffe10020 /* 16 bit SCIF/IRDA */
 # define SCIF_ORER 0x0001  /* overrun error bit */
-# define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
 # define SCSPTR0 0xff923020 /* 16 bit SCIF */
@@ -188,6 +189,7 @@
     defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
     defined(CONFIG_CPU_SUBTYPE_SH7751)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7763)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7780)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)  || \
     defined(CONFIG_CPU_SUBTYPE_SHX3)
@@ -225,14 +227,21 @@
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
     defined(CONFIG_CPU_SUBTYPE_SH7720) || \
     defined(CONFIG_CPU_SUBTYPE_SH7721)
-#define SCIF_ORER    0x0200
-#define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK | SCIF_ORER)
-#define SCIF_RFDC_MASK 0x007f
-#define SCIF_TXROOM_MAX 64
+# define SCIF_ORER    0x0200
+# define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK | SCIF_ORER)
+# define SCIF_RFDC_MASK 0x007f
+# define SCIF_TXROOM_MAX 64
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
+# define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK )
+# define SCIF_RFDC_MASK 0x007f
+# define SCIF_TXROOM_MAX 64
+/* SH7763 SCIF2 support */
+# define SCIF2_RFDC_MASK 0x001f
+# define SCIF2_TXROOM_MAX 16
 #else
-#define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
-#define SCIF_RFDC_MASK 0x001f
-#define SCIF_TXROOM_MAX 16
+# define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
+# define SCIF_RFDC_MASK 0x001f
+# define SCIF_TXROOM_MAX 16
 #endif
 
 #if defined(SCI_ONLY)
@@ -445,11 +454,16 @@ SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
     defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
-SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCTFDR,                     0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCRFDR,                     0x0e, 16, 0x20, 16)
 SCIF_FNS(SCSPTR,                        0,  0, 0x24, 16)
 SCIF_FNS(SCLSR,                         0,  0, 0x28, 16)
+#if defined(CONFIG_CPU_SUBTYPE_SH7763)
+/* SH7763 SCIF2 */
+SCIF_FNS(SCFDR,                         0,  0, 0x1C, 16)
+SCIF_FNS(SCSPTR2,                       0,  0, 0x20, 16)
+SCIF_FNS(SCLSR2,                        0,  0, 0x24, 16)
+#endif /* CONFIG_CPU_SUBTYPE_SH7763 */
 #else
 SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
 #if defined(CONFIG_CPU_SUBTYPE_SH7722)
@@ -652,6 +666,9 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
         if (port->mapbase == 0xffe08000)
                 return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffe10000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF/IRDA */
+
         return 1;
 }
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
@@ -764,8 +781,7 @@ static inline int sci_rxd_in(struct uart_port *port)
  * -- Mitch Davis - 15 Jul 2000
  */
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+#if defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(16*bps)-1)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 604e5f0a2d95..25eda71f4bf4 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -148,7 +148,6 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         unsigned rfalarm;
         unsigned send_at_once = MPC52xx_PSC_BUFSIZE;
         unsigned recv_at_once;
-        unsigned bpw = mps->bits_per_word / 8;
 
         if (!t->tx_buf && !t->rx_buf && t->len)
                 return -EINVAL;
@@ -164,22 +163,15 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
                 }
 
                 dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once);
-                if (tx_buf) {
-                        for (; send_at_once; sb++, send_at_once--) {
-                                /* set EOF flag */
-                                if (mps->bits_per_word
-                                                && (sb + 1) % bpw == 0)
-                                        out_8(&psc->ircr2, 0x01);
+                for (; send_at_once; sb++, send_at_once--) {
+                        /* set EOF flag before the last word is sent */
+                        if (send_at_once == 1)
+                                out_8(&psc->ircr2, 0x01);
+
+                        if (tx_buf)
                                 out_8(&psc->mpc52xx_psc_buffer_8, tx_buf[sb]);
-                        }
-                } else {
-                        for (; send_at_once; sb++, send_at_once--) {
-                                /* set EOF flag */
-                                if (mps->bits_per_word
-                                                && ((sb + 1) % bpw) == 0)
-                                        out_8(&psc->ircr2, 0x01);
+                        else
                                 out_8(&psc->mpc52xx_psc_buffer_8, 0);
-                        }
                 }
 
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ecca4a6a6f94..964124b60db2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -178,6 +178,96 @@ struct boardinfo {
 static LIST_HEAD(board_list);
 static DEFINE_MUTEX(board_lock);
 
+/**
+ * spi_alloc_device - Allocate a new SPI device
+ * @master: Controller to which device is connected
+ * Context: can sleep
+ *
+ * Allows a driver to allocate and initialize a spi_device without
+ * registering it immediately.  This allows a driver to directly
+ * fill the spi_device with device parameters before calling
+ * spi_add_device() on it.
+ *
+ * Caller is responsible to call spi_add_device() on the returned
+ * spi_device structure to add it to the SPI master.  If the caller
+ * needs to discard the spi_device without adding it, then it should
+ * call spi_dev_put() on it.
+ *
+ * Returns a pointer to the new device, or NULL.
+ */
+struct spi_device *spi_alloc_device(struct spi_master *master)
+{
+        struct spi_device       *spi;
+        struct device           *dev = master->dev.parent;
+
+        if (!spi_master_get(master))
+                return NULL;
+
+        spi = kzalloc(sizeof *spi, GFP_KERNEL);
+        if (!spi) {
+                dev_err(dev, "cannot alloc spi_device\n");
+                spi_master_put(master);
+                return NULL;
+        }
+
+        spi->master = master;
+        spi->dev.parent = dev;
+        spi->dev.bus = &spi_bus_type;
+        spi->dev.release = spidev_release;
+        device_initialize(&spi->dev);
+        return spi;
+}
+EXPORT_SYMBOL_GPL(spi_alloc_device);
+
+/**
+ * spi_add_device - Add spi_device allocated with spi_alloc_device
+ * @spi: spi_device to register
+ *
+ * Companion function to spi_alloc_device.  Devices allocated with
+ * spi_alloc_device can be added onto the spi bus with this function.
+ *
+ * Returns 0 on success; non-zero on failure
+ */
+int spi_add_device(struct spi_device *spi)
+{
+        struct device *dev = spi->master->dev.parent;
+        int status;
+
+        /* Chipselects are numbered 0..max; validate. */
+        if (spi->chip_select >= spi->master->num_chipselect) {
+                dev_err(dev, "cs%d >= max %d\n",
+                        spi->chip_select,
+                        spi->master->num_chipselect);
+                return -EINVAL;
+        }
+
+        /* Set the bus ID string */
+        snprintf(spi->dev.bus_id, sizeof spi->dev.bus_id,
+                        "%s.%u", spi->master->dev.bus_id,
+                        spi->chip_select);
+
+        /* drivers may modify this initial i/o setup */
+        status = spi->master->setup(spi);
+        if (status < 0) {
+                dev_err(dev, "can't %s %s, status %d\n",
+                                "setup", spi->dev.bus_id, status);
+                return status;
+        }
+
+        /* driver core catches callers that misbehave by defining
+         * devices that already exist.
+         */
+        status = device_add(&spi->dev);
+        if (status < 0) {
+                dev_err(dev, "can't %s %s, status %d\n",
+                                "add", spi->dev.bus_id, status);
+                return status;
+        }
+
+        dev_dbg(dev, "registered child %s\n", spi->dev.bus_id);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(spi_add_device);
 
 /**
  * spi_new_device - instantiate one new SPI device
@@ -197,7 +287,6 @@ struct spi_device *spi_new_device(struct spi_master *master,
                                   struct spi_board_info *chip)
 {
         struct spi_device       *proxy;
-        struct device           *dev = master->dev.parent;
         int                     status;
 
         /* NOTE:  caller did any chip->bus_num checks necessary.
@@ -207,66 +296,28 @@ struct spi_device *spi_new_device(struct spi_master *master,
          * suggests syslogged diagnostics are best here (ugh).
          */
 
-        /* Chipselects are numbered 0..max; validate. */
-        if (chip->chip_select >= master->num_chipselect) {
-                dev_err(dev, "cs%d > max %d\n",
-                        chip->chip_select,
-                        master->num_chipselect);
-                return NULL;
-        }
-
-        if (!spi_master_get(master))
+        proxy = spi_alloc_device(master);
+        if (!proxy)
                 return NULL;
 
         WARN_ON(strlen(chip->modalias) >= sizeof(proxy->modalias));
 
-        proxy = kzalloc(sizeof *proxy, GFP_KERNEL);
-        if (!proxy) {
-                dev_err(dev, "can't alloc dev for cs%d\n",
-                        chip->chip_select);
-                goto fail;
-        }
-        proxy->master = master;
         proxy->chip_select = chip->chip_select;
         proxy->max_speed_hz = chip->max_speed_hz;
         proxy->mode = chip->mode;
         proxy->irq = chip->irq;
         strlcpy(proxy->modalias, chip->modalias, sizeof(proxy->modalias));
-
-        snprintf(proxy->dev.bus_id, sizeof proxy->dev.bus_id,
-                        "%s.%u", master->dev.bus_id,
-                        chip->chip_select);
-        proxy->dev.parent = dev;
-        proxy->dev.bus = &spi_bus_type;
         proxy->dev.platform_data = (void *) chip->platform_data;
         proxy->controller_data = chip->controller_data;
         proxy->controller_state = NULL;
-        proxy->dev.release = spidev_release;
 
-        /* drivers may modify this initial i/o setup */
-        status = master->setup(proxy);
+        status = spi_add_device(proxy);
         if (status < 0) {
-                dev_err(dev, "can't %s %s, status %d\n",
-                                "setup", proxy->dev.bus_id, status);
-                goto fail;
+                spi_dev_put(proxy);
+                return NULL;
         }
 
-        /* driver core catches callers that misbehave by defining
-         * devices that already exist.
-         */
-        status = device_register(&proxy->dev);
-        if (status < 0) {
-                dev_err(dev, "can't %s %s, status %d\n",
-                                "add", proxy->dev.bus_id, status);
-                goto fail;
-        }
-        dev_dbg(dev, "registered child %s\n", proxy->dev.bus_id);
         return proxy;
-
-fail:
-        spi_master_put(master);
-        kfree(proxy);
-        return NULL;
 }
 EXPORT_SYMBOL_GPL(spi_new_device);
 
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 0885cc357a37..1c643c9e1f15 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -270,6 +270,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
         /* setup the master state. */
 
         master->num_chipselect = hw->pdata->num_cs;
+        master->bus_num = pdata->bus_num;
 
         /* setup the state for the bitbang driver */
 
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
index 51e26c1f5e8b..32dd85126931 100644
--- a/drivers/video/am200epd.c
+++ b/drivers/video/am200epd.c
@@ -221,7 +221,7 @@ static int am200_setup_irq(struct fb_info *info)
                 return retval;
         }
 
-        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQ_TYPE_EDGE_FALLING);
 }
 
 static void am200_set_rst(struct metronomefb_par *par, int state)
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 81dbcf53cf0e..fafd0f26b90f 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -646,7 +646,7 @@ static int sossi_init(struct omapfb_device *fbdev)
         sossi_write_reg(SOSSI_INIT1_REG, l);
 
         if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq,
-                             IRQT_FALLING,
+                             IRQ_TYPE_EDGE_FALLING,
              "sossi_match", sossi.fbdev->dev)) < 0) {
                 dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n");
                 goto err;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 2b707a8ce5de..69de2fed6c58 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1336,7 +1336,7 @@ static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
                 fbi->dma_buff_phys = fbi->map_dma;
                 fbi->palette_cpu = (u16 *) fbi->dma_buff->palette;
 
-                pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16));
+                pr_debug("pxafb: palette_mem_size = 0x%08x\n", fbi->palette_size*sizeof(u16));
 
 #ifdef CONFIG_FB_PXA_SMARTPANEL
                 fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 4d0e28c5790b..8d0212da4514 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -152,6 +152,7 @@ static int sh7760fb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
                 col |= ((*g) & 0xff) << 8;
                 col |= ((*b) & 0xff);
                 col &= SH7760FB_PALETTE_MASK;
+                iowrite32(col, par->base + LDPR(s));
 
                 if (s < 16)
                         ((u32 *) (info->pseudo_palette))[s] = s;
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 3263084eef9e..4a551af6f3fc 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -30,7 +30,7 @@ config COMPAT_BINFMT_ELF
 config BINFMT_ELF_FDPIC
         bool "Kernel support for FDPIC ELF binaries"
         default y
-        depends on (FRV || BLACKFIN)
+        depends on (FRV || BLACKFIN || (SUPERH32 && !MMU))
         help
           ELF FDPIC binaries are based on ELF, but allow the individual load
           segments of a binary to be located in memory independently of each
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index fdeadab2f18b..80c1f952ef78 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -470,6 +470,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
         char __user *u_platform, *p;
         long hwcap;
         int loop;
+        int nr; /* reset for each csp adjustment */
 
         /* we're going to shovel a whole load of stuff onto the stack */
 #ifdef CONFIG_MMU
@@ -542,10 +543,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
         /* force 16 byte _final_ alignment here for generality */
 #define DLINFO_ITEMS 13
 
-        nitems = 1 + DLINFO_ITEMS + (k_platform ? 1 : 0);
-#ifdef DLINFO_ARCH_ITEMS
-        nitems += DLINFO_ARCH_ITEMS;
-#endif
+        nitems = 1 + DLINFO_ITEMS + (k_platform ? 1 : 0) + AT_VECTOR_SIZE_ARCH;
 
         csp = sp;
         sp -= nitems * 2 * sizeof(unsigned long);
@@ -557,39 +555,46 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
         sp -= sp & 15UL;
 
         /* put the ELF interpreter info on the stack */
-#define NEW_AUX_ENT(nr, id, val)                                        \
+#define NEW_AUX_ENT(id, val)                                            \
         do {                                                            \
                 struct { unsigned long _id, _val; } __user *ent;        \
                                                                         \
                 ent = (void __user *) csp;                              \
                 __put_user((id), &ent[nr]._id);                         \
                 __put_user((val), &ent[nr]._val);                       \
+                nr++;                                                   \
         } while (0)
 
+        nr = 0;
         csp -= 2 * sizeof(unsigned long);
-        NEW_AUX_ENT(0, AT_NULL, 0);
+        NEW_AUX_ENT(AT_NULL, 0);
         if (k_platform) {
+                nr = 0;
                 csp -= 2 * sizeof(unsigned long);
-                NEW_AUX_ENT(0, AT_PLATFORM,
+                NEW_AUX_ENT(AT_PLATFORM,
                             (elf_addr_t) (unsigned long) u_platform);
         }
 
+        nr = 0;
         csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);
-        NEW_AUX_ENT( 0, AT_HWCAP,       hwcap);
-        NEW_AUX_ENT( 1, AT_PAGESZ,      PAGE_SIZE);
-        NEW_AUX_ENT( 2, AT_CLKTCK,      CLOCKS_PER_SEC);
-        NEW_AUX_ENT( 3, AT_PHDR,        exec_params->ph_addr);
-        NEW_AUX_ENT( 4, AT_PHENT,       sizeof(struct elf_phdr));
-        NEW_AUX_ENT( 5, AT_PHNUM,       exec_params->hdr.e_phnum);
-        NEW_AUX_ENT( 6, AT_BASE,        interp_params->elfhdr_addr);
-        NEW_AUX_ENT( 7, AT_FLAGS,       0);
-        NEW_AUX_ENT( 8, AT_ENTRY,       exec_params->entry_addr);
-        NEW_AUX_ENT( 9, AT_UID,         (elf_addr_t) current->uid);
-        NEW_AUX_ENT(10, AT_EUID,        (elf_addr_t) current->euid);
-        NEW_AUX_ENT(11, AT_GID,         (elf_addr_t) current->gid);
-        NEW_AUX_ENT(12, AT_EGID,        (elf_addr_t) current->egid);
+        NEW_AUX_ENT(AT_HWCAP,   hwcap);
+        NEW_AUX_ENT(AT_PAGESZ,  PAGE_SIZE);
+        NEW_AUX_ENT(AT_CLKTCK,  CLOCKS_PER_SEC);
+        NEW_AUX_ENT(AT_PHDR,    exec_params->ph_addr);
+        NEW_AUX_ENT(AT_PHENT,   sizeof(struct elf_phdr));
+        NEW_AUX_ENT(AT_PHNUM,   exec_params->hdr.e_phnum);
+        NEW_AUX_ENT(AT_BASE,    interp_params->elfhdr_addr);
+        NEW_AUX_ENT(AT_FLAGS,   0);
+        NEW_AUX_ENT(AT_ENTRY,   exec_params->entry_addr);
+        NEW_AUX_ENT(AT_UID,     (elf_addr_t) current->uid);
+        NEW_AUX_ENT(AT_EUID,    (elf_addr_t) current->euid);
+        NEW_AUX_ENT(AT_GID,     (elf_addr_t) current->gid);
+        NEW_AUX_ENT(AT_EGID,    (elf_addr_t) current->egid);
 
 #ifdef ARCH_DLINFO
+        nr = 0;
+        csp -= AT_VECTOR_SIZE_ARCH * 2 * sizeof(unsigned long);
+
         /* ARCH_DLINFO must come last so platform specific code can enforce
          * special alignment requirements on the AUXV if necessary (eg. PPC).
          */
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 63e2ee63058d..c3e174b35fe6 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -705,7 +705,6 @@ void __init bio_integrity_init_slab(void)
         bio_integrity_slab = KMEM_CACHE(bio_integrity_payload,
                                         SLAB_HWCACHE_ALIGN|SLAB_PANIC);
 }
-EXPORT_SYMBOL(bio_integrity_init_slab);
 
 static int __init integrity_init(void)
 {
diff --git a/fs/buffer.c b/fs/buffer.c
index f95805019639..ca12a6bb82b1 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2096,6 +2096,52 @@ int generic_write_end(struct file *file, struct address_space *mapping,
 EXPORT_SYMBOL(generic_write_end);
 
 /*
+ * block_is_partially_uptodate checks whether buffers within a page are
+ * uptodate or not.
+ *
+ * Returns true if all buffers which correspond to a file portion
+ * we want to read are uptodate.
+ */
+int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
+                                        unsigned long from)
+{
+        struct inode *inode = page->mapping->host;
+        unsigned block_start, block_end, blocksize;
+        unsigned to;
+        struct buffer_head *bh, *head;
+        int ret = 1;
+
+        if (!page_has_buffers(page))
+                return 0;
+
+        blocksize = 1 << inode->i_blkbits;
+        to = min_t(unsigned, PAGE_CACHE_SIZE - from, desc->count);
+        to = from + to;
+        if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize)
+                return 0;
+
+        head = page_buffers(page);
+        bh = head;
+        block_start = 0;
+        do {
+                block_end = block_start + blocksize;
+                if (block_end > from && block_start < to) {
+                        if (!buffer_uptodate(bh)) {
+                                ret = 0;
+                                break;
+                        }
+                        if (block_end >= to)
+                                break;
+                }
+                block_start = block_end;
+                bh = bh->b_this_page;
+        } while (bh != head);
+
+        return ret;
+}
+EXPORT_SYMBOL(block_is_partially_uptodate);
+
+/*
  * Generic "read page" function for block devices that have the normal
  * get_block functionality. This is most of the block device filesystems.
  * Reads the page asynchronously --- the unlock_buffer() and
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 2d3d1027ce2b..724ddac91538 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -363,6 +363,7 @@ static int search_rsb_list(struct list_head *head, char *name, int len,
                 if (len == r->res_length && !memcmp(name, r->res_name, len))
                         goto found;
         }
+        *r_ret = NULL;
         return -EBADR;
 
  found:
@@ -1782,7 +1783,8 @@ static void grant_pending_locks(struct dlm_rsb *r)
 
         list_for_each_entry_safe(lkb, s, &r->res_grantqueue, lkb_statequeue) {
                 if (lkb->lkb_bastfn && lock_requires_bast(lkb, high, cw)) {
-                        if (cw && high == DLM_LOCK_PR)
+                        if (cw && high == DLM_LOCK_PR &&
+                            lkb->lkb_grmode == DLM_LOCK_PR)
                                 queue_bast(r, lkb, DLM_LOCK_CW);
                         else
                                 queue_bast(r, lkb, high);
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 637018c891ef..3962262f991a 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -891,8 +891,10 @@ static void tcp_connect_to_sock(struct connection *con)
                 goto out_err;
 
         memset(&saddr, 0, sizeof(saddr));
-        if (dlm_nodeid_to_addr(con->nodeid, &saddr))
+        if (dlm_nodeid_to_addr(con->nodeid, &saddr)) {
+                sock_release(sock);
                 goto out_err;
+        }
 
         sock->sk->sk_user_data = con;
         con->rx_action = receive_from_sock;
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index f976f303c196..929e48ae7591 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -539,7 +539,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
 
         /* do we really need this? can a write happen after a close? */
         if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) &&
-            test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))
+            (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags)))
                 return -EINVAL;
 
         sigfillset(&allsigs);
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 7b99917ffadc..06db79d05c12 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -475,8 +475,8 @@ int ecryptfs_encrypt_page(struct page *page)
 {
         struct inode *ecryptfs_inode;
         struct ecryptfs_crypt_stat *crypt_stat;
-        char *enc_extent_virt = NULL;
-        struct page *enc_extent_page;
+        char *enc_extent_virt;
+        struct page *enc_extent_page = NULL;
         loff_t extent_offset;
         int rc = 0;
 
@@ -492,14 +492,14 @@ int ecryptfs_encrypt_page(struct page *page)
                                page->index);
                 goto out;
         }
-        enc_extent_virt = kmalloc(PAGE_CACHE_SIZE, GFP_USER);
-        if (!enc_extent_virt) {
+        enc_extent_page = alloc_page(GFP_USER);
+        if (!enc_extent_page) {
                 rc = -ENOMEM;
                 ecryptfs_printk(KERN_ERR, "Error allocating memory for "
                                 "encrypted extent\n");
                 goto out;
         }
-        enc_extent_page = virt_to_page(enc_extent_virt);
+        enc_extent_virt = kmap(enc_extent_page);
         for (extent_offset = 0;
              extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
              extent_offset++) {
@@ -527,7 +527,10 @@ int ecryptfs_encrypt_page(struct page *page)
                 }
         }
 out:
-        kfree(enc_extent_virt);
+        if (enc_extent_page) {
+                kunmap(enc_extent_page);
+                __free_page(enc_extent_page);
+        }
         return rc;
 }
 
@@ -609,8 +612,8 @@ int ecryptfs_decrypt_page(struct page *page)
 {
         struct inode *ecryptfs_inode;
         struct ecryptfs_crypt_stat *crypt_stat;
-        char *enc_extent_virt = NULL;
-        struct page *enc_extent_page;
+        char *enc_extent_virt;
+        struct page *enc_extent_page = NULL;
         unsigned long extent_offset;
         int rc = 0;
 
@@ -627,14 +630,14 @@ int ecryptfs_decrypt_page(struct page *page)
                                page->index);
                 goto out;
         }
-        enc_extent_virt = kmalloc(PAGE_CACHE_SIZE, GFP_USER);
-        if (!enc_extent_virt) {
+        enc_extent_page = alloc_page(GFP_USER);
+        if (!enc_extent_page) {
                 rc = -ENOMEM;
                 ecryptfs_printk(KERN_ERR, "Error allocating memory for "
                                 "encrypted extent\n");
                 goto out;
         }
-        enc_extent_page = virt_to_page(enc_extent_virt);
+        enc_extent_virt = kmap(enc_extent_page);
         for (extent_offset = 0;
              extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
              extent_offset++) {
@@ -662,7 +665,10 @@ int ecryptfs_decrypt_page(struct page *page)
                 }
         }
 out:
-        kfree(enc_extent_virt);
+        if (enc_extent_page) {
+                kunmap(enc_extent_page);
+                __free_page(enc_extent_page);
+        }
         return rc;
 }
 
diff --git a/fs/exec.c b/fs/exec.c
index 9696bbf0f0b1..32993beecbe9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -32,6 +32,7 @@
 #include <linux/swap.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/pagemap.h>
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
 #include <linux/key.h>
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 384fc0d1dd74..991d6dfeb51f 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -791,6 +791,7 @@ const struct address_space_operations ext2_aops = {
         .direct_IO              = ext2_direct_IO,
         .writepages             = ext2_writepages,
         .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 const struct address_space_operations ext2_aops_xip = {
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 3bf07d70b914..507d8689b111 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1767,44 +1767,47 @@ static int ext3_journalled_set_page_dirty(struct page *page)
 }
 
 static const struct address_space_operations ext3_ordered_aops = {
-        .readpage       = ext3_readpage,
-        .readpages      = ext3_readpages,
-        .writepage      = ext3_ordered_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext3_write_begin,
-        .write_end      = ext3_ordered_write_end,
-        .bmap           = ext3_bmap,
-        .invalidatepage = ext3_invalidatepage,
-        .releasepage    = ext3_releasepage,
-        .direct_IO      = ext3_direct_IO,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ext3_readpage,
+        .readpages              = ext3_readpages,
+        .writepage              = ext3_ordered_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext3_write_begin,
+        .write_end              = ext3_ordered_write_end,
+        .bmap                   = ext3_bmap,
+        .invalidatepage         = ext3_invalidatepage,
+        .releasepage            = ext3_releasepage,
+        .direct_IO              = ext3_direct_IO,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 static const struct address_space_operations ext3_writeback_aops = {
-        .readpage       = ext3_readpage,
-        .readpages      = ext3_readpages,
-        .writepage      = ext3_writeback_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext3_write_begin,
-        .write_end      = ext3_writeback_write_end,
-        .bmap           = ext3_bmap,
-        .invalidatepage = ext3_invalidatepage,
-        .releasepage    = ext3_releasepage,
-        .direct_IO      = ext3_direct_IO,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ext3_readpage,
+        .readpages              = ext3_readpages,
+        .writepage              = ext3_writeback_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext3_write_begin,
+        .write_end              = ext3_writeback_write_end,
+        .bmap                   = ext3_bmap,
+        .invalidatepage         = ext3_invalidatepage,
+        .releasepage            = ext3_releasepage,
+        .direct_IO              = ext3_direct_IO,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 static const struct address_space_operations ext3_journalled_aops = {
-        .readpage       = ext3_readpage,
-        .readpages      = ext3_readpages,
-        .writepage      = ext3_journalled_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext3_write_begin,
-        .write_end      = ext3_journalled_write_end,
-        .set_page_dirty = ext3_journalled_set_page_dirty,
-        .bmap           = ext3_bmap,
-        .invalidatepage = ext3_invalidatepage,
-        .releasepage    = ext3_releasepage,
+        .readpage               = ext3_readpage,
+        .readpages              = ext3_readpages,
+        .writepage              = ext3_journalled_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext3_write_begin,
+        .write_end              = ext3_journalled_write_end,
+        .set_page_dirty         = ext3_journalled_set_page_dirty,
+        .bmap                   = ext3_bmap,
+        .invalidatepage         = ext3_invalidatepage,
+        .releasepage            = ext3_releasepage,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 void ext3_set_aops(struct inode *inode)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8ca2763df091..9843b046c235 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2806,59 +2806,63 @@ static int ext4_journalled_set_page_dirty(struct page *page)
 }
 
 static const struct address_space_operations ext4_ordered_aops = {
-        .readpage       = ext4_readpage,
-        .readpages      = ext4_readpages,
-        .writepage      = ext4_normal_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext4_write_begin,
-        .write_end      = ext4_ordered_write_end,
-        .bmap           = ext4_bmap,
-        .invalidatepage = ext4_invalidatepage,
-        .releasepage    = ext4_releasepage,
-        .direct_IO      = ext4_direct_IO,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ext4_readpage,
+        .readpages              = ext4_readpages,
+        .writepage              = ext4_normal_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext4_write_begin,
+        .write_end              = ext4_ordered_write_end,
+        .bmap                   = ext4_bmap,
+        .invalidatepage         = ext4_invalidatepage,
+        .releasepage            = ext4_releasepage,
+        .direct_IO              = ext4_direct_IO,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 static const struct address_space_operations ext4_writeback_aops = {
-        .readpage       = ext4_readpage,
-        .readpages      = ext4_readpages,
-        .writepage      = ext4_normal_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext4_write_begin,
-        .write_end      = ext4_writeback_write_end,
-        .bmap           = ext4_bmap,
-        .invalidatepage = ext4_invalidatepage,
-        .releasepage    = ext4_releasepage,
-        .direct_IO      = ext4_direct_IO,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ext4_readpage,
+        .readpages              = ext4_readpages,
+        .writepage              = ext4_normal_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext4_write_begin,
+        .write_end              = ext4_writeback_write_end,
+        .bmap                   = ext4_bmap,
+        .invalidatepage         = ext4_invalidatepage,
+        .releasepage            = ext4_releasepage,
+        .direct_IO              = ext4_direct_IO,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 static const struct address_space_operations ext4_journalled_aops = {
-        .readpage       = ext4_readpage,
-        .readpages      = ext4_readpages,
-        .writepage      = ext4_journalled_writepage,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext4_write_begin,
-        .write_end      = ext4_journalled_write_end,
-        .set_page_dirty = ext4_journalled_set_page_dirty,
-        .bmap           = ext4_bmap,
-        .invalidatepage = ext4_invalidatepage,
-        .releasepage    = ext4_releasepage,
+        .readpage               = ext4_readpage,
+        .readpages              = ext4_readpages,
+        .writepage              = ext4_journalled_writepage,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext4_write_begin,
+        .write_end              = ext4_journalled_write_end,
+        .set_page_dirty         = ext4_journalled_set_page_dirty,
+        .bmap                   = ext4_bmap,
+        .invalidatepage         = ext4_invalidatepage,
+        .releasepage            = ext4_releasepage,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 static const struct address_space_operations ext4_da_aops = {
-        .readpage       = ext4_readpage,
-        .readpages      = ext4_readpages,
-        .writepage      = ext4_da_writepage,
-        .writepages     = ext4_da_writepages,
-        .sync_page      = block_sync_page,
-        .write_begin    = ext4_da_write_begin,
-        .write_end      = ext4_da_write_end,
-        .bmap           = ext4_bmap,
-        .invalidatepage = ext4_da_invalidatepage,
-        .releasepage    = ext4_releasepage,
-        .direct_IO      = ext4_direct_IO,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ext4_readpage,
+        .readpages              = ext4_readpages,
+        .writepage              = ext4_da_writepage,
+        .writepages             = ext4_da_writepages,
+        .sync_page              = block_sync_page,
+        .write_begin            = ext4_da_write_begin,
+        .write_end              = ext4_da_write_end,
+        .bmap                   = ext4_bmap,
+        .invalidatepage         = ext4_da_invalidatepage,
+        .releasepage            = ext4_releasepage,
+        .direct_IO              = ext4_direct_IO,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };
 
 void ext4_set_aops(struct inode *inode)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1b94e3650f5c..9abcd2b329f7 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1718,9 +1718,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
          * ones were explicitly specified. Fall back to legacy behavior and
          * just return success.
          */
-        if ((nfsvers == 4 && options4->version == 1) ||
-            (nfsvers <= 3 && options->version >= 1 &&
-             options->version <= 6))
+        if ((nfsvers == 4 && (!options4 || options4->version == 1)) ||
+            (nfsvers <= 3 && (!options || (options->version >= 1 &&
+                                           options->version <= 6))))
                 return 0;
 
         data = kzalloc(sizeof(*data), GFP_KERNEL);
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 3adf8b266461..f089e5839d7d 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -95,10 +95,11 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
 static void nfs_async_unlink_release(void *calldata)
 {
         struct nfs_unlinkdata   *data = calldata;
+        struct super_block *sb = data->dir->i_sb;
 
         nfs_dec_sillycount(data->dir);
-        nfs_sb_deactive(NFS_SERVER(data->dir));
         nfs_free_unlinkdata(data);
+        nfs_sb_deactive(NFS_SB(sb));
 }
 
 static const struct rpc_call_ops nfs_unlink_ops = {
diff --git a/fs/proc/base.c b/fs/proc/base.c
index e74308bdabd3..01ed610f9b87 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -53,6 +53,7 @@
 #include <linux/time.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
+#include <linux/task_io_accounting_ops.h>
 #include <linux/init.h>
 #include <linux/capability.h>
 #include <linux/file.h>
@@ -2402,44 +2403,17 @@ static int proc_base_fill_cache(struct file *filp, void *dirent,
 #ifdef CONFIG_TASK_IO_ACCOUNTING
 static int do_io_accounting(struct task_struct *task, char *buffer, int whole)
 {
-        u64 rchar, wchar, syscr, syscw;
-        struct task_io_accounting ioac;
-
-        rchar = task->rchar;
-        wchar = task->wchar;
-        syscr = task->syscr;
-        syscw = task->syscw;
-        memcpy(&ioac, &task->ioac, sizeof(ioac));
-
-        if (whole) {
-                unsigned long flags;
-
-                if (lock_task_sighand(task, &flags)) {
-                        struct signal_struct *sig = task->signal;
-                        struct task_struct *t = task;
-
-                        rchar += sig->rchar;
-                        wchar += sig->wchar;
-                        syscr += sig->syscr;
-                        syscw += sig->syscw;
-
-                        ioac.read_bytes += sig->ioac.read_bytes;
-                        ioac.write_bytes += sig->ioac.write_bytes;
-                        ioac.cancelled_write_bytes +=
-                                        sig->ioac.cancelled_write_bytes;
-                        while_each_thread(task, t) {
-                                rchar += t->rchar;
-                                wchar += t->wchar;
-                                syscr += t->syscr;
-                                syscw += t->syscw;
-
-                                ioac.read_bytes += t->ioac.read_bytes;
-                                ioac.write_bytes += t->ioac.write_bytes;
-                                ioac.cancelled_write_bytes +=
-                                        t->ioac.cancelled_write_bytes;
-                        }
-                        unlock_task_sighand(task, &flags);
-                }
+        struct task_io_accounting acct = task->ioac;
+        unsigned long flags;
+
+        if (whole && lock_task_sighand(task, &flags)) {
+                struct task_struct *t = task;
+
+                task_io_accounting_add(&acct, &task->signal->ioac);
+                while_each_thread(task, t)
+                        task_io_accounting_add(&acct, &t->ioac);
+
+                unlock_task_sighand(task, &flags);
         }
         return sprintf(buffer,
                         "rchar: %llu\n"
@@ -2449,9 +2423,10 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole)
                         "read_bytes: %llu\n"
                         "write_bytes: %llu\n"
                         "cancelled_write_bytes: %llu\n",
-                        rchar, wchar, syscr, syscw,
-                        ioac.read_bytes, ioac.write_bytes,
-                        ioac.cancelled_write_bytes);
+                        acct.rchar, acct.wchar,
+                        acct.syscr, acct.syscw,
+                        acct.read_bytes, acct.write_bytes,
+                        acct.cancelled_write_bytes);
 }
 
 static int proc_tid_io_accounting(struct task_struct *task, char *buffer)
diff --git a/include/Kbuild b/include/Kbuild
index bdca155028ec..d8c3e3cbf416 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,3 +1,6 @@
+# Top-level Makefile calls into asm-$(ARCH)
+# List only non-arch directories below
+
 header-y += asm-generic/
 header-y += linux/
 header-y += sound/
@@ -5,5 +8,3 @@ header-y += mtd/
 header-y += rdma/
 header-y += video/
 header-y += drm/
-
-header-y += asm-$(ARCH)/
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1ebbe883f786..13a3d9ad92db 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -277,6 +277,7 @@ enum acpi_prefered_pm_profiles {
 #define BAF_LEGACY_DEVICES              0x0001
 #define BAF_8042_KEYBOARD_CONTROLLER    0x0002
 #define BAF_MSI_NOT_SUPPORTED           0x0008
+#define BAF_PCIE_ASPM_CONTROL           0x0010
 
 #define FADT2_REVISION_ID               3
 #define FADT2_MINUS_REVISION_ID         2
diff --git a/include/asm-arm/arch-pnx4008/irqs.h b/include/asm-arm/arch-pnx4008/irqs.h
index 13ec7ed0f501..a25d18f2d87a 100644
--- a/include/asm-arm/arch-pnx4008/irqs.h
+++ b/include/asm-arm/arch-pnx4008/irqs.h
@@ -135,30 +135,30 @@
 
 #define PNX4008_IRQ_TYPES \
 {                                           /*IRQ #'s: */         \
-IRQT_LOW,  IRQT_LOW,  IRQT_LOW,  IRQT_HIGH, /*  0, 1, 2, 3 */     \
-IRQT_LOW,  IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /*  4, 5, 6, 7 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /*  8, 9,10,11 */     \
-IRQT_LOW,  IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 12,13,14,15 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 16,17,18,19 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 20,21,22,23 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 24,25,26,27 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_LOW,  IRQT_LOW,  /* 28,29,30,31 */     \
-IRQT_HIGH, IRQT_LOW,  IRQT_HIGH, IRQT_HIGH, /* 32,33,34,35 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_FALLING, IRQT_HIGH, /* 36,37,38,39 */  \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 40,41,42,43 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 44,45,46,47 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_LOW,  IRQT_LOW,  /* 48,49,50,51 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 52,53,54,55 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_LOW,  IRQT_HIGH, /* 56,57,58,59 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 60,61,62,63 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 64,65,66,67 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 68,69,70,71 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 72,73,74,75 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 76,77,78,79 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 80,81,82,83 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 84,85,86,87 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 88,89,90,91 */     \
-IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 92,93,94,95 */     \
+IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_HIGH, /*  0, 1, 2, 3 */     \
+IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /*  4, 5, 6, 7 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /*  8, 9,10,11 */     \
+IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 12,13,14,15 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 16,17,18,19 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 20,21,22,23 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 24,25,26,27 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_LOW,  /* 28,29,30,31 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 32,33,34,35 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_HIGH, /* 36,37,38,39 */  \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 40,41,42,43 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 44,45,46,47 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_LOW,  /* 48,49,50,51 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 52,53,54,55 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW,  IRQ_TYPE_LEVEL_HIGH, /* 56,57,58,59 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 60,61,62,63 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 64,65,66,67 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 68,69,70,71 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 72,73,74,75 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 76,77,78,79 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 80,81,82,83 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 84,85,86,87 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 88,89,90,91 */     \
+IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 92,93,94,95 */     \
 }
 
 /* Start Enable Pin Interrupts - table 58 page 66 */
diff --git a/include/asm-arm/arch-pxa/idp.h b/include/asm-arm/arch-pxa/idp.h
index b6952534a4e1..21aa8ac35c1c 100644
--- a/include/asm-arm/arch-pxa/idp.h
+++ b/include/asm-arm/arch-pxa/idp.h
@@ -138,18 +138,18 @@
 #define TOUCH_PANEL_IRQ                 IRQ_GPIO(5)
 #define IDE_IRQ                         IRQ_GPIO(21)
 
-#define TOUCH_PANEL_IRQ_EDGE            IRQT_FALLING
+#define TOUCH_PANEL_IRQ_EDGE            IRQ_TYPE_EDGE_FALLING
 
 #define ETHERNET_IRQ                    IRQ_GPIO(4)
-#define ETHERNET_IRQ_EDGE               IRQT_RISING
+#define ETHERNET_IRQ_EDGE               IRQ_TYPE_EDGE_RISING
 
-#define IDE_IRQ_EDGE                    IRQT_RISING
+#define IDE_IRQ_EDGE                    IRQ_TYPE_EDGE_RISING
 
 #define PCMCIA_S0_CD_VALID              IRQ_GPIO(7)
-#define PCMCIA_S0_CD_VALID_EDGE         IRQT_BOTHEDGE
+#define PCMCIA_S0_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
 #define PCMCIA_S1_CD_VALID              IRQ_GPIO(8)
-#define PCMCIA_S1_CD_VALID_EDGE         IRQT_BOTHEDGE
+#define PCMCIA_S1_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
 #define PCMCIA_S0_RDYINT                IRQ_GPIO(19)
 #define PCMCIA_S1_RDYINT                IRQ_GPIO(22)
diff --git a/include/asm-arm/arch-pxa/pcm990_baseboard.h b/include/asm-arm/arch-pxa/pcm990_baseboard.h
index b699d0d7bdb2..2e2013179063 100644
--- a/include/asm-arm/arch-pxa/pcm990_baseboard.h
+++ b/include/asm-arm/arch-pxa/pcm990_baseboard.h
@@ -29,14 +29,14 @@
 /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */
 #define PCM990_CTRL_INT_IRQ_GPIO        9
 #define PCM990_CTRL_INT_IRQ             IRQ_GPIO(PCM990_CTRL_INT_IRQ_GPIO)
-#define PCM990_CTRL_INT_IRQ_EDGE        IRQT_RISING
+#define PCM990_CTRL_INT_IRQ_EDGE        IRQ_TYPE_EDGE_RISING
 #define PCM990_CTRL_PHYS                PXA_CS1_PHYS    /* 16-Bit */
 #define PCM990_CTRL_BASE                0xea000000
 #define PCM990_CTRL_SIZE                (1*1024*1024)
 
 #define PCM990_CTRL_PWR_IRQ_GPIO        14
 #define PCM990_CTRL_PWR_IRQ             IRQ_GPIO(PCM990_CTRL_PWR_IRQ_GPIO)
-#define PCM990_CTRL_PWR_IRQ_EDGE        IRQT_RISING
+#define PCM990_CTRL_PWR_IRQ_EDGE        IRQ_TYPE_EDGE_RISING
 
 /* visible CPLD (U7) registers */
 #define PCM990_CTRL_REG0        0x0000  /* RESET REGISTER */
@@ -133,7 +133,7 @@
  */
 #define PCM990_IDE_IRQ_GPIO     13
 #define PCM990_IDE_IRQ          IRQ_GPIO(PCM990_IDE_IRQ_GPIO)
-#define PCM990_IDE_IRQ_EDGE     IRQT_RISING
+#define PCM990_IDE_IRQ_EDGE     IRQ_TYPE_EDGE_RISING
 #define PCM990_IDE_PLD_PHYS     0x20000000      /* 16 bit wide */
 #define PCM990_IDE_PLD_BASE     0xee000000
 #define PCM990_IDE_PLD_SIZE     (1*1024*1024)
@@ -189,11 +189,11 @@
  */
 #define PCM990_CF_IRQ_GPIO      11
 #define PCM990_CF_IRQ           IRQ_GPIO(PCM990_CF_IRQ_GPIO)
-#define PCM990_CF_IRQ_EDGE      IRQT_RISING
+#define PCM990_CF_IRQ_EDGE      IRQ_TYPE_EDGE_RISING
 
 #define PCM990_CF_CD_GPIO       12
 #define PCM990_CF_CD            IRQ_GPIO(PCM990_CF_CD_GPIO)
-#define PCM990_CF_CD_EDGE       IRQT_RISING
+#define PCM990_CF_CD_EDGE       IRQ_TYPE_EDGE_RISING
 
 #define PCM990_CF_PLD_PHYS      0x30000000      /* 16 bit wide */
 #define PCM990_CF_PLD_BASE      0xef000000
@@ -259,14 +259,14 @@
  */
 #define PCM990_AC97_IRQ_GPIO    10
 #define PCM990_AC97_IRQ         IRQ_GPIO(PCM990_AC97_IRQ_GPIO)
-#define PCM990_AC97_IRQ_EDGE    IRQT_RISING
+#define PCM990_AC97_IRQ_EDGE    IRQ_TYPE_EDGE_RISING
 
 /*
  * MMC phyCORE
  */
 #define PCM990_MMC0_IRQ_GPIO    9
 #define PCM990_MMC0_IRQ         IRQ_GPIO(PCM990_MMC0_IRQ_GPIO)
-#define PCM990_MMC0_IRQ_EDGE    IRQT_FALLING
+#define PCM990_MMC0_IRQ_EDGE    IRQ_TYPE_EDGE_FALLING
 
 /*
  * USB phyCore
diff --git a/include/asm-arm/arch-pxa/pxa25x-udc.h b/include/asm-arm/arch-pxa/pxa25x-udc.h
index 840305916b6d..1b80a4805a60 100644
--- a/include/asm-arm/arch-pxa/pxa25x-udc.h
+++ b/include/asm-arm/arch-pxa/pxa25x-udc.h
@@ -2,7 +2,7 @@
 #define _ASM_ARCH_PXA25X_UDC_H
 
 #ifdef _ASM_ARCH_PXA27X_UDC_H
-#error You can't include both PXA25x and PXA27x UDC support
+#error "You can't include both PXA25x and PXA27x UDC support"
 #endif
 
 #define UDC_RES1        __REG(0x40600004)  /* UDC Undocumented - Reserved1 */
diff --git a/include/asm-arm/arch-s3c2410/spi.h b/include/asm-arm/arch-s3c2410/spi.h
index 352d33860b63..442169887d3b 100644
--- a/include/asm-arm/arch-s3c2410/spi.h
+++ b/include/asm-arm/arch-s3c2410/spi.h
@@ -16,6 +16,7 @@
 struct s3c2410_spi_info {
         unsigned long            pin_cs;        /* simple gpio cs */
         unsigned int             num_cs;        /* total chipselects */
+        int                      bus_num;       /* bus number to use. */
 
         void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
 };
diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h
index b14cbda01dc3..193f6c15f4dd 100644
--- a/include/asm-arm/arch-sa1100/ide.h
+++ b/include/asm-arm/arch-sa1100/ide.h
@@ -61,7 +61,7 @@ ide_init_default_hwifs(void)
 
         /* Enable GPIO as interrupt line */
         GPDR &= ~LART_GPIO_IDE;
-        set_irq_type(LART_IRQ_IDE, IRQT_RISING);
+        set_irq_type(LART_IRQ_IDE, IRQ_TYPE_EDGE_RISING);
 
         /* set PCMCIA interface timing */
         MECR = 0x00060006;
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 5c60bfc1a84d..9a1db20e032a 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -277,9 +277,16 @@ static inline int constant_fls(int x)
  * the clz instruction for much better code efficiency.
  */
 
-#define fls(x) \
+#define __fls(x) \
         ( __builtin_constant_p(x) ? constant_fls(x) : \
           ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
+
+/* Implement fls() in C so that 64-bit args are suitably truncated */
+static inline int fls(int x)
+{
+        return __fls(x);
+}
+
 #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
 #define __ffs(x) (ffs(x) - 1)
 #define ffz(x) __ffs( ~(x) )
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index 03cf1ee977b7..e68a1cbcc852 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -459,15 +459,19 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,
 #define __cacheid_vivt_asid_tagged_instr(val)   (__cacheid_type_v7(val) ? ((val & (3 << 14)) == (1 << 14)) : 0)
 
 #if defined(CONFIG_CPU_CACHE_VIVT) && !defined(CONFIG_CPU_CACHE_VIPT)
-
+/*
+ * VIVT caches only
+ */
 #define cache_is_vivt()                 1
 #define cache_is_vipt()                 0
 #define cache_is_vipt_nonaliasing()     0
 #define cache_is_vipt_aliasing()        0
 #define icache_is_vivt_asid_tagged()    0
 
-#elif defined(CONFIG_CPU_CACHE_VIPT)
-
+#elif !defined(CONFIG_CPU_CACHE_VIVT) && defined(CONFIG_CPU_CACHE_VIPT)
+/*
+ * VIPT caches only
+ */
 #define cache_is_vivt()                 0
 #define cache_is_vipt()                 1
 #define cache_is_vipt_nonaliasing()                                     \
@@ -489,7 +493,12 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,
         })
 
 #else
-
+/*
+ * VIVT or VIPT caches.  Note that this is unreliable since ARM926
+ * and V6 CPUs satisfy the "(val & (15 << 25)) == (14 << 25)" test.
+ * There's no way to tell from the CacheType register what type (!)
+ * the cache is.
+ */
 #define cache_is_vivt()                                                 \
         ({                                                              \
                 unsigned int __val = read_cpuid(CPUID_CACHETYPE);       \
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index f41335ba6337..45329fca1b64 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -7,6 +7,8 @@
 
 #include <linux/scatterlist.h>
 
+#include <asm-generic/dma-coherent.h>
+
 /*
  * DMA-consistent mapping functions.  These allocate/free a region of
  * uncached, unwrite-buffered mapped memory space for use with DMA
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h
index 1b882a255e35..9cb01907e43b 100644
--- a/include/asm-arm/irq.h
+++ b/include/asm-arm/irq.h
@@ -19,23 +19,6 @@
 #define NO_IRQ  ((unsigned int)(-1))
 #endif
 
-
-/*
- * Migration helpers
- */
-#define __IRQT_FALEDGE  IRQ_TYPE_EDGE_FALLING
-#define __IRQT_RISEDGE  IRQ_TYPE_EDGE_RISING
-#define __IRQT_LOWLVL   IRQ_TYPE_LEVEL_LOW
-#define __IRQT_HIGHLVL  IRQ_TYPE_LEVEL_HIGH
-
-#define IRQT_NOEDGE     (0)
-#define IRQT_RISING     (__IRQT_RISEDGE)
-#define IRQT_FALLING    (__IRQT_FALEDGE)
-#define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)
-#define IRQT_LOW        (__IRQT_LOWLVL)
-#define IRQT_HIGH       (__IRQT_HIGHLVL)
-#define IRQT_PROBE      IRQ_TYPE_PROBE
-
 #ifndef __ASSEMBLY__
 struct irqaction;
 extern void migrate_irqs(void);
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index 75feb1574a69..2d84792f2e12 100644
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -78,6 +78,14 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
         return root;
 }
 
+/*
+ * Dummy implementation; always return 0.
+ */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+        return 0;
+}
+
 #endif /* __KERNEL__ */
  
 #endif
diff --git a/include/asm-arm/plat-s3c/iic.h b/include/asm-arm/plat-s3c/iic.h
index 71211c8b5384..d08a1f2863e4 100644
--- a/include/asm-arm/plat-s3c/iic.h
+++ b/include/asm-arm/plat-s3c/iic.h
@@ -21,6 +21,7 @@
 */
 
 struct s3c2410_platform_i2c {
+        int             bus_num;        /* bus number to use */
         unsigned int    flags;
         unsigned int    slave_addr;     /* slave address for controller */
         unsigned long   bus_freq;       /* standard bus frequency */
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h
index 893aa6d0cd11..e60e9076544d 100644
--- a/include/asm-avr32/arch-at32ap/board.h
+++ b/include/asm-avr32/arch-at32ap/board.h
@@ -82,7 +82,15 @@ struct mci_platform_data;
 struct platform_device *
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data);
 
-struct platform_device *at32_add_device_ac97c(unsigned int id);
+struct ac97c_platform_data {
+        unsigned short dma_rx_periph_id;
+        unsigned short dma_tx_periph_id;
+        unsigned short dma_controller_id;
+        int reset_pin;
+};
+struct platform_device *
+at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data);
+
 struct platform_device *at32_add_device_abdac(unsigned int id);
 struct platform_device *at32_add_device_psif(unsigned int id);
 
diff --git a/include/asm-cris/dma-mapping.h b/include/asm-cris/dma-mapping.h
index cb2fb25ff8d9..da8ef8e8f842 100644
--- a/include/asm-cris/dma-mapping.h
+++ b/include/asm-cris/dma-mapping.h
@@ -14,6 +14,8 @@
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 
 #ifdef CONFIG_PCI
+#include <asm-generic/dma-coherent.h>
+
 void *dma_alloc_coherent(struct device *dev, size_t size,
                            dma_addr_t *dma_handle, gfp_t flag);
 
diff --git a/include/asm-generic/dma-coherent.h b/include/asm-generic/dma-coherent.h
new file mode 100644
index 000000000000..85a3ffaa0242
--- /dev/null
+++ b/include/asm-generic/dma-coherent.h
@@ -0,0 +1,32 @@
+#ifndef DMA_COHERENT_H
+#define DMA_COHERENT_H
+
+#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
+/*
+ * These two functions are only for dma allocator.
+ * Don't use them in device drivers.
+ */
+int dma_alloc_from_coherent(struct device *dev, ssize_t size,
+                                       dma_addr_t *dma_handle, void **ret);
+int dma_release_from_coherent(struct device *dev, int order, void *vaddr);
+
+/*
+ * Standard interface
+ */
+#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
+extern int
+dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
+                            dma_addr_t device_addr, size_t size, int flags);
+
+extern void
+dma_release_declared_memory(struct device *dev);
+
+extern void *
+dma_mark_declared_memory_occupied(struct device *dev,
+                                  dma_addr_t device_addr, size_t size);
+#else
+#define dma_alloc_from_coherent(dev, size, handle, ret) (0)
+#define dma_release_from_coherent(dev, order, vaddr) (0)
+#endif
+
+#endif
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index c764a8fcb058..0f99ad38b012 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -2,6 +2,7 @@
 #define _ASM_GENERIC_GPIO_H
 
 #include <linux/types.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_GPIOLIB
 
diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
index 087325ede76c..a7cdc48e8b78 100644
--- a/include/asm-generic/pgtable-nopmd.h
+++ b/include/asm-generic/pgtable-nopmd.h
@@ -5,6 +5,8 @@
 
 #include <asm-generic/pgtable-nopud.h>
 
+struct mm_struct;
+
 #define __PAGETABLE_PMD_FOLDED
 
 /*
@@ -54,7 +56,9 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address)
  * inside the pud, so has no extra memory associated with it.
  */
 #define pmd_alloc_one(mm, address)              NULL
-#define pmd_free(mm, x)                         do { } while (0)
+static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
+{
+}
 #define __pmd_free_tlb(tlb, x)                  do { } while (0)
 
 #undef  pmd_addr_end
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 9cd44b162ba1..6d88a923c945 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -221,6 +221,7 @@
  * during second ld run in second ld pass when generating System.map */
 #define TEXT_TEXT                                                       \
                 ALIGN_FUNCTION();                                       \
+                *(.text.hot)                                            \
                 *(.text)                                                \
                 *(.ref.text)                                            \
                 *(.text.init.refok)                                     \
@@ -230,7 +231,8 @@
         CPU_KEEP(init.text)                                             \
         CPU_KEEP(exit.text)                                             \
         MEM_KEEP(init.text)                                             \
-        MEM_KEEP(exit.text)
+        MEM_KEEP(exit.text)                                             \
+                *(.text.unlikely)
 
 
 /* sched.text is aling to function alignment to secure we have same
diff --git a/include/asm-powerpc/kvm_ppc.h b/include/asm-powerpc/kvm_ppc.h
index 5a21115228af..a8b068792260 100644
--- a/include/asm-powerpc/kvm_ppc.h
+++ b/include/asm-powerpc/kvm_ppc.h
@@ -61,7 +61,8 @@ extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);
 
 extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn,
                            u64 asid, u32 flags);
-extern void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, u64 eaddr, u64 asid);
+extern void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,
+                                  gva_t eend, u32 asid);
 extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);
 
 extern void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu);
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h
index c9601dfb4a1e..6b18ba9d2d85 100644
--- a/include/asm-powerpc/pgtable-4k.h
+++ b/include/asm-powerpc/pgtable-4k.h
@@ -46,6 +46,8 @@
 #define _PAGE_GROUP_IX  0x7000 /* software: HPTE index within group */
 #define _PAGE_F_SECOND  _PAGE_SECONDARY
 #define _PAGE_F_GIX     _PAGE_GROUP_IX
+#define _PAGE_SPECIAL   0x10000 /* software: special page */
+#define __HAVE_ARCH_PTE_SPECIAL
 
 /* PTE flags to conserve for HPTE identification */
 #define _PAGE_HPTEFLAGS (_PAGE_BUSY | _PAGE_HASHPTE | \
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h
index 7e54adb35596..07b0d8f09cb6 100644
--- a/include/asm-powerpc/pgtable-64k.h
+++ b/include/asm-powerpc/pgtable-64k.h
@@ -70,6 +70,8 @@ static inline struct subpage_prot_table *pgd_subpage_prot(pgd_t *pgd)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
 
 /* Additional PTE bits (don't change without checking asm in hash_low.S) */
+#define __HAVE_ARCH_PTE_SPECIAL
+#define _PAGE_SPECIAL   0x00000400 /* software: special page */
 #define _PAGE_HPTE_SUB  0x0ffff000 /* combo only: sub pages HPTE bits */
 #define _PAGE_HPTE_SUB0 0x08000000 /* combo only: first sub page */
 #define _PAGE_COMBO     0x10000000 /* this is a combo 4k page */
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index bdbab72f3ebc..6fe39e327047 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -401,6 +401,9 @@ extern int icache_44x_need_flush;
 #ifndef _PAGE_COHERENT
 #define _PAGE_COHERENT  0
 #endif
+#ifndef _PAGE_WRITETHRU
+#define _PAGE_WRITETHRU 0
+#endif
 #ifndef _PMD_PRESENT_MASK
 #define _PMD_PRESENT_MASK       _PMD_PRESENT
 #endif
diff --git a/include/asm-powerpc/pgtable-ppc64.h b/include/asm-powerpc/pgtable-ppc64.h
index ba8000352b9a..5fc78c0be302 100644
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
@@ -245,7 +245,7 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW;}
 static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY;}
 static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED;}
 static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE;}
-static inline int pte_special(pte_t pte) { return 0; }
+static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; }
 
 static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; }
 static inline void pte_cache(pte_t pte)   { pte_val(pte) &= ~_PAGE_NO_CACHE; }
@@ -265,7 +265,7 @@ static inline pte_t pte_mkyoung(pte_t pte) {
 static inline pte_t pte_mkhuge(pte_t pte) {
         return pte; }
 static inline pte_t pte_mkspecial(pte_t pte) {
-        return pte; }
+        pte_val(pte) |= _PAGE_SPECIAL; return pte; }
 static inline unsigned long pte_pgprot(pte_t pte)
 {
         return __pgprot(pte_val(pte)) & PAGE_PROT_BITS;
diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h
index 3d6e31024e56..734e0754fb9b 100644
--- a/include/asm-powerpc/ptrace.h
+++ b/include/asm-powerpc/ptrace.h
@@ -84,6 +84,7 @@ struct pt_regs {
 #ifndef __ASSEMBLY__
 
 #define instruction_pointer(regs) ((regs)->nip)
+#define user_stack_pointer(regs) ((regs)->gpr[1])
 #define regs_return_value(regs) ((regs)->gpr[3])
 
 #ifdef CONFIG_SMP
diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h
index a8c7babf4950..a7360cdd99eb 100644
--- a/include/asm-powerpc/signal.h
+++ b/include/asm-powerpc/signal.h
@@ -122,8 +122,7 @@ typedef struct sigaltstack {
 
 #ifdef __KERNEL__
 struct pt_regs;
-extern int do_signal(sigset_t *oldset, struct pt_regs *regs);
-extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);
+extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif /* __KERNEL__ */
 
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h
index 416d4c288cea..4d28e1e4521b 100644
--- a/include/asm-powerpc/smp.h
+++ b/include/asm-powerpc/smp.h
@@ -62,6 +62,8 @@ extern int smp_hw_index[];
 #endif
 
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
+DECLARE_PER_CPU(cpumask_t, cpu_core_map);
+extern int cpu_to_core_id(int cpu);
 
 /* Since OpenPIC has only 4 IPIs, we use slightly different message numbers.
  *
diff --git a/include/asm-powerpc/syscall.h b/include/asm-powerpc/syscall.h
new file mode 100644
index 000000000000..efa7f0b879f3
--- /dev/null
+++ b/include/asm-powerpc/syscall.h
@@ -0,0 +1,84 @@
+/*
+ * Access to user system call parameters and results
+ *
+ * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * See asm-generic/syscall.h for descriptions of what we must do here.
+ */
+
+#ifndef _ASM_SYSCALL_H
+#define _ASM_SYSCALL_H  1
+
+#include <linux/sched.h>
+
+static inline long syscall_get_nr(struct task_struct *task,
+                                  struct pt_regs *regs)
+{
+        return TRAP(regs) == 0xc00 ? regs->gpr[0] : -1L;
+}
+
+static inline void syscall_rollback(struct task_struct *task,
+                                    struct pt_regs *regs)
+{
+        regs->gpr[3] = regs->orig_gpr3;
+}
+
+static inline long syscall_get_error(struct task_struct *task,
+                                     struct pt_regs *regs)
+{
+        return (regs->ccr & 0x1000) ? -regs->gpr[3] : 0;
+}
+
+static inline long syscall_get_return_value(struct task_struct *task,
+                                            struct pt_regs *regs)
+{
+        return regs->gpr[3];
+}
+
+static inline void syscall_set_return_value(struct task_struct *task,
+                                            struct pt_regs *regs,
+                                            int error, long val)
+{
+        if (error) {
+                regs->ccr |= 0x1000L;
+                regs->gpr[3] = -error;
+        } else {
+                regs->ccr &= ~0x1000L;
+                regs->gpr[3] = val;
+        }
+}
+
+static inline void syscall_get_arguments(struct task_struct *task,
+                                         struct pt_regs *regs,
+                                         unsigned int i, unsigned int n,
+                                         unsigned long *args)
+{
+        BUG_ON(i + n > 6);
+#ifdef CONFIG_PPC64
+        if (test_tsk_thread_flag(task, TIF_32BIT)) {
+                /*
+                 * Zero-extend 32-bit argument values.  The high bits are
+                 * garbage ignored by the actual syscall dispatch.
+                 */
+                while (n-- > 0)
+                        args[n] = (u32) regs->gpr[3 + i + n];
+                return;
+        }
+#endif
+        memcpy(args, &regs->gpr[3 + i], n * sizeof(args[0]));
+}
+
+static inline void syscall_set_arguments(struct task_struct *task,
+                                         struct pt_regs *regs,
+                                         unsigned int i, unsigned int n,
+                                         const unsigned long *args)
+{
+        BUG_ON(i + n > 6);
+        memcpy(&regs->gpr[3 + i], args, n * sizeof(args[0]));
+}
+
+#endif  /* _ASM_SYSCALL_H */
diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h
index a9db562df69a..9665a26a253a 100644
--- a/include/asm-powerpc/thread_info.h
+++ b/include/asm-powerpc/thread_info.h
@@ -108,6 +108,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SECCOMP             10      /* secure computing */
 #define TIF_RESTOREALL          11      /* Restore all regs (implies NOERROR) */
 #define TIF_NOERROR             12      /* Force successful syscall return */
+#define TIF_NOTIFY_RESUME       13      /* callback before returning to user */
 #define TIF_FREEZE              14      /* Freezing for suspend */
 #define TIF_RUNLATCH            15      /* Is the runlatch enabled? */
 #define TIF_ABI_PENDING         16      /* 32/64 bit switch needed */
@@ -125,12 +126,14 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_RESTOREALL         (1<<TIF_RESTOREALL)
 #define _TIF_NOERROR            (1<<TIF_NOERROR)
+#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
 #define _TIF_RUNLATCH           (1<<TIF_RUNLATCH)
 #define _TIF_ABI_PENDING        (1<<TIF_ABI_PENDING)
 #define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
 
-#define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | _TIF_NEED_RESCHED)
+#define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
+                                 _TIF_NOTIFY_RESUME)
 #define _TIF_PERSYSCALL_MASK    (_TIF_RESTOREALL|_TIF_NOERROR)
 
 /* Bits in local_flags */
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 100c6fbfc587..c32da6f97999 100644
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -108,6 +108,8 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev,
 #include <asm/smp.h>
 
 #define topology_thread_siblings(cpu)   (per_cpu(cpu_sibling_map, cpu))
+#define topology_core_siblings(cpu)     (per_cpu(cpu_core_map, cpu))
+#define topology_core_id(cpu)           (cpu_to_core_id(cpu))
 #endif
 #endif
 
diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h
index 3234dd5b3511..3c55e4107dcc 100644
--- a/include/asm-s390/kvm_host.h
+++ b/include/asm-s390/kvm_host.h
@@ -111,7 +111,7 @@ struct kvm_vcpu_stat {
         u32 exit_validity;
         u32 exit_instruction;
         u32 instruction_lctl;
-        u32 instruction_lctg;
+        u32 instruction_lctlg;
         u32 exit_program_interruption;
         u32 exit_instr_and_program;
         u32 deliver_emergency_signal;
@@ -231,5 +231,5 @@ struct kvm_arch{
         struct kvm_s390_float_interrupt float_int;
 };
 
-extern int sie64a(struct kvm_s390_sie_block *, __u64 *);
+extern int sie64a(struct kvm_s390_sie_block *, unsigned long *);
 #endif
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h
index b550a27a7042..720dfab7b15e 100644
--- a/include/asm-sh/clock.h
+++ b/include/asm-sh/clock.h
@@ -5,6 +5,7 @@
 #include <linux/list.h>
 #include <linux/seq_file.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 
 struct clk;
 
@@ -30,6 +31,7 @@ struct clk {
 
         unsigned long           rate;
         unsigned long           flags;
+        unsigned long           arch_flags;
 };
 
 #define CLK_ALWAYS_ENABLED      (1 << 0)
@@ -41,14 +43,27 @@ void arch_init_clk_ops(struct clk_ops **, int type);
 /* arch/sh/kernel/cpu/clock.c */
 int clk_init(void);
 
-int __clk_enable(struct clk *);
-void __clk_disable(struct clk *);
-
 void clk_recalc_rate(struct clk *);
 
 int clk_register(struct clk *);
 void clk_unregister(struct clk *);
 
+static inline int clk_always_enable(const char *id)
+{
+        struct clk *clk;
+        int ret;
+
+        clk = clk_get(NULL, id);
+        if (IS_ERR(clk))
+                return PTR_ERR(clk);
+
+        ret = clk_enable(clk);
+        if (ret)
+                clk_put(clk);
+
+        return ret;
+}
+
 /* the exported API, in addition to clk_set_rate */
 /**
  * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/include/asm-sh/cpu-sh4/cacheflush.h
index 5fd5c89ef86a..065306d376eb 100644
--- a/include/asm-sh/cpu-sh4/cacheflush.h
+++ b/include/asm-sh/cpu-sh4/cacheflush.h
@@ -30,7 +30,6 @@ void flush_dcache_page(struct page *pg);
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
 
 void flush_icache_range(unsigned long start, unsigned long end);
-void flush_cache_sigtramp(unsigned long addr);
 void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
                              unsigned long addr, int len);
 
diff --git a/include/asm-sh/cpu-sh4/freq.h b/include/asm-sh/cpu-sh4/freq.h
index da46e67ae26d..c23af81c2e70 100644
--- a/include/asm-sh/cpu-sh4/freq.h
+++ b/include/asm-sh/cpu-sh4/freq.h
@@ -12,12 +12,16 @@
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7722) || \
     defined(CONFIG_CPU_SUBTYPE_SH7723) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7343) || \
     defined(CONFIG_CPU_SUBTYPE_SH7366)
 #define FRQCR                   0xa4150000
 #define VCLKCR                  0xa4150004
 #define SCLKACR                 0xa4150008
 #define SCLKBCR                 0xa415000c
 #define IrDACLKCR               0xa4150010
+#define MSTPCR0                 0xa4150030
+#define MSTPCR1                 0xa4150034
+#define MSTPCR2                 0xa4150038
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
       defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define FRQCR                   0xffc80000
diff --git a/include/asm-sh/device.h b/include/asm-sh/device.h
index d8f9872b0e2d..efd511d0803a 100644
--- a/include/asm-sh/device.h
+++ b/include/asm-sh/device.h
@@ -5,3 +5,8 @@
  */
 #include <asm-generic/device.h>
 
+struct platform_device;
+/* allocate contiguous memory chunk and fill in struct resource */
+int platform_resource_setup_memory(struct platform_device *pdev,
+                                   char *name, unsigned long memsize);
+
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index 6c0b8a2de143..627315ecdb52 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -5,6 +5,7 @@
 #include <linux/scatterlist.h>
 #include <asm/cacheflush.h>
 #include <asm/io.h>
+#include <asm-generic/dma-coherent.h>
 
 extern struct bus_type pci_bus_type;
 
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h
index 05092da1aa59..f01449a8d378 100644
--- a/include/asm-sh/elf.h
+++ b/include/asm-sh/elf.h
@@ -1,10 +1,15 @@
 #ifndef __ASM_SH_ELF_H
 #define __ASM_SH_ELF_H
 
+#include <linux/utsname.h>
 #include <asm/auxvec.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
 
+/* ELF header e_flags defines */
+#define EF_SH_PIC               0x100   /* -fpic */
+#define EF_SH_FDPIC             0x8000  /* -mfdpic */
+
 /* SH (particularly SHcompact) relocation types  */
 #define R_SH_NONE               0
 #define R_SH_DIR32              1
@@ -43,6 +48,28 @@
 #define R_SH_RELATIVE           165
 #define R_SH_GOTOFF             166
 #define R_SH_GOTPC              167
+
+/* FDPIC relocs */
+#define R_SH_GOT20              70
+#define R_SH_GOTOFF20           71
+#define R_SH_GOTFUNCDESC        72
+#define R_SH_GOTFUNCDESC20      73
+#define R_SH_GOTOFFFUNCDESC     74
+#define R_SH_GOTOFFFUNCDESC20   75
+#define R_SH_FUNCDESC           76
+#define R_SH_FUNCDESC_VALUE     77
+
+#if 0 /* XXX - later .. */
+#define R_SH_GOT20              198
+#define R_SH_GOTOFF20           199
+#define R_SH_GOTFUNCDESC        200
+#define R_SH_GOTFUNCDESC20      201
+#define R_SH_GOTOFFFUNCDESC     202
+#define R_SH_GOTOFFFUNCDESC20   203
+#define R_SH_FUNCDESC           204
+#define R_SH_FUNCDESC_VALUE     205
+#endif
+
 /* SHmedia relocs */
 #define R_SH_IMM_LOW16          246
 #define R_SH_IMM_LOW16_PCREL    247
@@ -77,9 +104,12 @@ typedef struct user_fpu_struct elf_fpregset_t;
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  */
-#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
+#define elf_check_arch(x)               ((x)->e_machine == EM_SH)
+#define elf_check_fdpic(x)              ((x)->e_flags & EF_SH_FDPIC)
+#define elf_check_const_displacement(x) ((x)->e_flags & EF_SH_PIC)
 
 #define USE_ELF_CORE_DUMP
+#define ELF_FDPIC_CORE_EFLAGS   EF_SH_FDPIC
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
@@ -136,6 +166,27 @@ typedef struct user_fpu_struct elf_fpregset_t;
        _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \
        _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; \
        _r->sr = SR_FD; } while (0)
+
+#define ELF_FDPIC_PLAT_INIT(_r, _exec_map_addr, _interp_map_addr,       \
+                            _dynamic_addr)                              \
+do {                                                                    \
+        _r->regs[0]     = 0;                                            \
+        _r->regs[1]     = 0;                                            \
+        _r->regs[2]     = 0;                                            \
+        _r->regs[3]     = 0;                                            \
+        _r->regs[4]     = 0;                                            \
+        _r->regs[5]     = 0;                                            \
+        _r->regs[6]     = 0;                                            \
+        _r->regs[7]     = 0;                                            \
+        _r->regs[8]     = _exec_map_addr;                               \
+        _r->regs[9]     = _interp_map_addr;                             \
+        _r->regs[10]    = _dynamic_addr;                                \
+        _r->regs[11]    = 0;                                            \
+        _r->regs[12]    = 0;                                            \
+        _r->regs[13]    = 0;                                            \
+        _r->regs[14]    = 0;                                            \
+        _r->sr          = SR_FD;                                        \
+} while (0)
 #endif
 
 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index 7438d1e21bc9..d557b00111bf 100644
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -79,7 +79,7 @@ struct intc_desc {
         struct intc_sense_reg *sense_regs;
         unsigned int nr_sense_regs;
         char *name;
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         struct intc_mask_reg *ack_regs;
         unsigned int nr_ack_regs;
 #endif
@@ -95,7 +95,7 @@ struct intc_desc symbol __initdata = {					\
         chipname,                                                       \
 }
 
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups,        \
         mask_regs, prio_regs, sense_regs, ack_regs)                     \
 struct intc_desc symbol __initdata = {                                  \
diff --git a/include/asm-sh/migor.h b/include/asm-sh/migor.h
index 2329363afdc3..10016e0f4a4e 100644
--- a/include/asm-sh/migor.h
+++ b/include/asm-sh/migor.h
@@ -16,10 +16,6 @@
 #include <asm/addrspace.h>
 
 /* GPIO */
-#define MSTPCR0 0xa4150030
-#define MSTPCR1 0xa4150034
-#define MSTPCR2 0xa4150038
-
 #define PORT_PACR 0xa4050100
 #define PORT_PDCR 0xa4050106
 #define PORT_PECR 0xa4050108
@@ -29,11 +25,16 @@
 #define PORT_PLCR 0xa4050114
 #define PORT_PMCR 0xa4050116
 #define PORT_PRCR 0xa405011c
+#define PORT_PTCR 0xa4050140
+#define PORT_PUCR 0xa4050142
+#define PORT_PVCR 0xa4050144
 #define PORT_PWCR 0xa4050146
 #define PORT_PXCR 0xa4050148
 #define PORT_PYCR 0xa405014a
 #define PORT_PZCR 0xa405014c
 #define PORT_PADR 0xa4050120
+#define PORT_PHDR 0xa405012e
+#define PORT_PTDR 0xa4050160
 #define PORT_PWDR 0xa4050166
 
 #define PORT_HIZCRA 0xa4050158
@@ -48,6 +49,7 @@
 #define PORT_PSELB 0xa4050150
 #define PORT_PSELC 0xa4050152
 #define PORT_PSELD 0xa4050154
+#define PORT_PSELE 0xa4050156
 
 #define PORT_HIZCRA 0xa4050158
 #define PORT_HIZCRB 0xa405015a
@@ -55,4 +57,9 @@
 
 #define BSC_CS6ABCR 0xfec1001c
 
+#include <asm/sh_mobile_lcdc.h>
+
+int migor_lcd_qvga_setup(void *board_data, void *sys_ops_handle,
+                         struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
+
 #endif /* __ASM_SH_MIGOR_H */
diff --git a/include/asm-sh/mmu.h b/include/asm-sh/mmu.h
index eb0358c097d0..fdcb93bc6d11 100644
--- a/include/asm-sh/mmu.h
+++ b/include/asm-sh/mmu.h
@@ -12,6 +12,10 @@ typedef struct {
         struct vm_list_struct   *vmlist;
         unsigned long           end_brk;
 #endif
+#ifdef CONFIG_BINFMT_ELF_FDPIC
+        unsigned long           exec_fdpic_loadmap;
+        unsigned long           interp_fdpic_loadmap;
+#endif
 } mm_context_t;
 
 /*
diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h
index 87e812f68bb0..8589a50febd0 100644
--- a/include/asm-sh/mmu_context.h
+++ b/include/asm-sh/mmu_context.h
@@ -27,8 +27,9 @@
 /* ASID is 8-bit value, so it can't be 0x100 */
 #define MMU_NO_ASID                     0x100
 
-#ifdef CONFIG_MMU
 #define asid_cache(cpu)         (cpu_data[cpu].asid_cache)
+
+#ifdef CONFIG_MMU
 #define cpu_context(cpu, mm)    ((mm)->context.id[cpu])
 
 #define cpu_asid(cpu, mm)       \
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index 5dc01d2fcc4c..77fb8bf02e4e 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -12,6 +12,8 @@
 # define PAGE_SHIFT     12
 #elif defined(CONFIG_PAGE_SIZE_8KB)
 # define PAGE_SHIFT     13
+#elif defined(CONFIG_PAGE_SIZE_16KB)
+# define PAGE_SHIFT     14
 #elif defined(CONFIG_PAGE_SIZE_64KB)
 # define PAGE_SHIFT     16
 #else
diff --git a/include/asm-sh/pgtable_32.h b/include/asm-sh/pgtable_32.h
index cbc731d35c25..72ea209195bd 100644
--- a/include/asm-sh/pgtable_32.h
+++ b/include/asm-sh/pgtable_32.h
@@ -102,7 +102,9 @@
 #define _PAGE_FLAGS_HARDWARE_MASK       (PHYS_ADDR_MASK & ~(_PAGE_CLEAR_FLAGS))
 
 /* Hardware flags, page size encoding */
-#if defined(CONFIG_X2TLB)
+#if !defined(CONFIG_MMU)
+# define _PAGE_FLAGS_HARD       0ULL
+#elif defined(CONFIG_X2TLB)
 # if defined(CONFIG_PAGE_SIZE_4KB)
 #  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ0)
 # elif defined(CONFIG_PAGE_SIZE_8KB)
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index b7c7ce80f03e..15d9f92ca383 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -2,6 +2,7 @@
 #define __ASM_SH_PROCESSOR_H
 
 #include <asm/cpu-features.h>
+#include <asm/segment.h>
 
 #ifndef __ASSEMBLY__
 /*
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h
index c09305d6a9d9..c6583f267071 100644
--- a/include/asm-sh/processor_32.h
+++ b/include/asm-sh/processor_32.h
@@ -28,6 +28,7 @@
 
 struct sh_cpuinfo {
         unsigned int type;
+        int cut_major, cut_minor;
         unsigned long loops_per_jiffy;
         unsigned long asid_cache;
 
@@ -113,10 +114,6 @@ struct thread_struct {
         union sh_fpu_union fpu;
 };
 
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
 /* Count of active tasks with UBC settings */
 extern int ubc_usercnt;
 
diff --git a/include/asm-sh/processor_64.h b/include/asm-sh/processor_64.h
index 88a2edf8fa5d..fc7fc685ba27 100644
--- a/include/asm-sh/processor_64.h
+++ b/include/asm-sh/processor_64.h
@@ -166,10 +166,6 @@ struct thread_struct {
         union sh_fpu_union fpu;
 };
 
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
 #define INIT_MMAP \
 { &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
 
diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h
index 7d36dc3bee69..643ab5a7cf3b 100644
--- a/include/asm-sh/ptrace.h
+++ b/include/asm-sh/ptrace.h
@@ -87,6 +87,11 @@ struct pt_dspregs {
         unsigned long   mod;
 };
 
+#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
+
+#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
+#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
+
 #define PTRACE_GETDSPREGS       55
 #define PTRACE_SETDSPREGS       56
 #endif
diff --git a/include/asm-sh/se.h b/include/asm-sh/se.h
index bd2596c014a9..eb23000e1bbe 100644
--- a/include/asm-sh/se.h
+++ b/include/asm-sh/se.h
@@ -76,6 +76,23 @@
 #define IRQ_CFCARD      7
 #endif
 
+/* SH Ether support (SH7710/SH7712) */
+/* Base address */
+#define SH_ETH0_BASE 0xA7000000
+#define SH_ETH1_BASE 0xA7000400
+/* PHY ID */
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+# define PHY_ID 0x00
+#elif defined(CONFIG_CPU_SUBTYPE_SH7712)
+# define PHY_ID 0x01
+#endif
+/* Ether IRQ */
+#define SH_ETH0_IRQ     80
+#define SH_ETH1_IRQ     81
+#define SH_TSU_IRQ      82
+
+void init_se_IRQ(void);
+
 #define __IO_PREFIX     se
 #include <asm/io_generic.h>
 
diff --git a/include/asm-sh/se7343.h b/include/asm-sh/se7343.h
index e7914a54aa96..98458460e632 100644
--- a/include/asm-sh/se7343.h
+++ b/include/asm-sh/se7343.h
@@ -59,24 +59,91 @@
 #define PA_LCD1         0xb8000000
 #define PA_LCD2         0xb8800000
 
+#define PORT_PACR       0xA4050100
+#define PORT_PBCR       0xA4050102
+#define PORT_PCCR       0xA4050104
+#define PORT_PDCR       0xA4050106
+#define PORT_PECR       0xA4050108
+#define PORT_PFCR       0xA405010A
+#define PORT_PGCR       0xA405010C
+#define PORT_PHCR       0xA405010E
+#define PORT_PJCR       0xA4050110
+#define PORT_PKCR       0xA4050112
+#define PORT_PLCR       0xA4050114
+#define PORT_PMCR       0xA4050116
+#define PORT_PNCR       0xA4050118
+#define PORT_PQCR       0xA405011A
+#define PORT_PRCR       0xA405011C
+#define PORT_PSCR       0xA405011E
+#define PORT_PTCR       0xA4050140
+#define PORT_PUCR       0xA4050142
+#define PORT_PVCR       0xA4050144
+#define PORT_PWCR       0xA4050146
+#define PORT_PYCR       0xA4050148
+#define PORT_PZCR       0xA405014A
+
+#define PORT_PSELA      0xA405014C
+#define PORT_PSELB      0xA405014E
+#define PORT_PSELC      0xA4050150
+#define PORT_PSELD      0xA4050152
+#define PORT_PSELE      0xA4050154
+
+#define PORT_HIZCRA     0xA4050156
+#define PORT_HIZCRB     0xA4050158
+#define PORT_HIZCRC     0xA405015C
+
+#define PORT_DRVCR      0xA4050180
+
+#define PORT_PADR       0xA4050120
+#define PORT_PBDR       0xA4050122
+#define PORT_PCDR       0xA4050124
+#define PORT_PDDR       0xA4050126
+#define PORT_PEDR       0xA4050128
+#define PORT_PFDR       0xA405012A
+#define PORT_PGDR       0xA405012C
+#define PORT_PHDR       0xA405012E
+#define PORT_PJDR       0xA4050130
+#define PORT_PKDR       0xA4050132
+#define PORT_PLDR       0xA4050134
+#define PORT_PMDR       0xA4050136
+#define PORT_PNDR       0xA4050138
+#define PORT_PQDR       0xA405013A
+#define PORT_PRDR       0xA405013C
+#define PORT_PTDR       0xA4050160
+#define PORT_PUDR       0xA4050162
+#define PORT_PVDR       0xA4050164
+#define PORT_PWDR       0xA4050166
+#define PORT_PYDR       0xA4050168
+
+#define FPGA_IN         0xb1400000
+#define FPGA_OUT        0xb1400002
+
 #define __IO_PREFIX     sh7343se
 #include <asm/io_generic.h>
 
-/* External Multiplexed interrupts */
-#define PC_IRQ0         OFFCHIP_IRQ_BASE
-#define PC_IRQ1         (PC_IRQ0 + 1)
-#define PC_IRQ2         (PC_IRQ1 + 1)
-#define PC_IRQ3         (PC_IRQ2 + 1)
+#define IRQ0_IRQ        32
+#define IRQ1_IRQ        33
+#define IRQ4_IRQ        36
+#define IRQ5_IRQ        37
+
+#define SE7343_FPGA_IRQ_MRSHPC0 0
+#define SE7343_FPGA_IRQ_MRSHPC1 1
+#define SE7343_FPGA_IRQ_MRSHPC2 2
+#define SE7343_FPGA_IRQ_MRSHPC3 3
+#define SE7343_FPGA_IRQ_SMC     6       /* EXT_IRQ2 */
+#define SE7343_FPGA_IRQ_USB     8
 
-#define EXT_IRQ0        (PC_IRQ3 + 1)
-#define EXT_IRQ1        (EXT_IRQ0 + 1)
-#define EXT_IRQ2        (EXT_IRQ1 + 1)
-#define EXT_IRQ3        (EXT_IRQ2 + 1)
+#define SE7343_FPGA_IRQ_NR      11
+#define SE7343_FPGA_IRQ_BASE    120
 
-#define USB_IRQ0        (EXT_IRQ3 + 1)
-#define USB_IRQ1        (USB_IRQ0 + 1)
+#define MRSHPC_IRQ3     (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_MRSHPC3)
+#define MRSHPC_IRQ2     (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_MRSHPC2)
+#define MRSHPC_IRQ1     (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_MRSHPC1)
+#define MRSHPC_IRQ0     (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_MRSHPC0)
+#define SMC_IRQ         (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_SMC)
+#define USB_IRQ         (SE7343_FPGA_IRQ_BASE + SE7343_FPGA_IRQ_USB)
 
-#define UART_IRQ0       (USB_IRQ1 + 1)
-#define UART_IRQ1       (UART_IRQ0 + 1)
+/* arch/sh/boards/se/7343/irq.c */
+void init_7343se_IRQ(void);
 
 #endif  /* __ASM_SH_HITACHI_SE7343_H */
diff --git a/include/asm-sh/se7722.h b/include/asm-sh/se7722.h
index 3690fe5857a4..e971d9a82f4a 100644
--- a/include/asm-sh/se7722.h
+++ b/include/asm-sh/se7722.h
@@ -55,10 +55,6 @@
 
 #define PA_LAN          (PA_AREA6_IO + 0)               /* SMC LAN91C111 */
 /* GPIO */
-#define MSTPCR0         0xA4150030UL
-#define MSTPCR1         0xA4150034UL
-#define MSTPCR2         0xA4150038UL
-
 #define FPGA_IN         0xb1840000UL
 #define FPGA_OUT        0xb1840004UL
 
diff --git a/include/asm-sh/segment.h b/include/asm-sh/segment.h
index e417eab4c7d7..5e2725f4ac49 100644
--- a/include/asm-sh/segment.h
+++ b/include/asm-sh/segment.h
@@ -1,6 +1,34 @@
 #ifndef __ASM_SH_SEGMENT_H
 #define __ASM_SH_SEGMENT_H
 
-/* Only here because we have some old header files that expect it.. */
+#ifndef __ASSEMBLY__
 
+typedef struct {
+        unsigned long seg;
+} mm_segment_t;
+
+#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
+
+/*
+ * The fs value determines whether argument validity checking should be
+ * performed or not.  If get_fs() == USER_DS, checking is performed, with
+ * get_fs() == KERNEL_DS, checking is bypassed.
+ *
+ * For historical reasons, these macros are grossly misnamed.
+ */
+#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFFUL)
+#ifdef CONFIG_MMU
+#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
+#else
+#define USER_DS         KERNEL_DS
+#endif
+
+#define segment_eq(a,b) ((a).seg == (b).seg)
+
+#define get_ds()        (KERNEL_DS)
+
+#define get_fs()        (current_thread_info()->addr_limit)
+#define set_fs(x)       (current_thread_info()->addr_limit = (x))
+
+#endif /* __ASSEMBLY__ */
 #endif /* __ASM_SH_SEGMENT_H */
diff --git a/include/asm-sh/sh7763rdp.h b/include/asm-sh/sh7763rdp.h
new file mode 100644
index 000000000000..8750cc852977
--- /dev/null
+++ b/include/asm-sh/sh7763rdp.h
@@ -0,0 +1,54 @@
+#ifndef __ASM_SH_SH7763RDP_H
+#define __ASM_SH_SH7763RDP_H
+
+/*
+ * linux/include/asm-sh/sh7763drp.h
+ *
+ * Copyright (C) 2008 Renesas Solutions
+ * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ */
+#include <asm/addrspace.h>
+
+/* clock control */
+#define MSTPCR1 0xFFC80038
+
+/* PORT */
+#define PORT_PSEL0      0xFFEF0070
+#define PORT_PSEL1      0xFFEF0072
+#define PORT_PSEL2      0xFFEF0074
+#define PORT_PSEL3      0xFFEF0076
+#define PORT_PSEL4      0xFFEF0078
+
+#define PORT_PACR       0xFFEF0000
+#define PORT_PCCR       0xFFEF0004
+#define PORT_PFCR       0xFFEF000A
+#define PORT_PGCR       0xFFEF000C
+#define PORT_PHCR       0xFFEF000E
+#define PORT_PICR       0xFFEF0010
+#define PORT_PJCR       0xFFEF0012
+#define PORT_PKCR       0xFFEF0014
+#define PORT_PLCR       0xFFEF0016
+#define PORT_PMCR       0xFFEF0018
+#define PORT_PNCR       0xFFEF001A
+
+/* FPGA */
+#define CPLD_BOARD_ID_ERV_REG   0xB1000000
+#define CPLD_CPLD_CMD_REG               0xB1000006
+
+/*
+ * USB SH7763RDP board can use Host only.
+ */
+#define USB_USBHSC      0xFFEC80f0
+
+/* arch/sh/boards/renesas/sh7763rdp/irq.c */
+void init_sh7763rdp_IRQ(void);
+int sh7763rdp_irq_demux(int irq);
+#define __IO_PREFIX     sh7763rdp
+#include <asm/io_generic.h>
+
+#endif /* __ASM_SH_SH7763RDP_H */
diff --git a/include/asm-sh/sh7785lcr.h b/include/asm-sh/sh7785lcr.h
new file mode 100644
index 000000000000..1ce27d5c7491
--- /dev/null
+++ b/include/asm-sh/sh7785lcr.h
@@ -0,0 +1,55 @@
+#ifndef __ASM_SH_RENESAS_SH7785LCR_H
+#define __ASM_SH_RENESAS_SH7785LCR_H
+
+/*
+ * This board has 2 physical memory maps.
+ * It can be changed with DIP switch(S2-5).
+ *
+ * phys address                 | S2-5 = OFF    | S2-5 = ON
+ * -----------------------------+---------------+---------------
+ * 0x00000000 - 0x03ffffff(CS0) | NOR Flash     | NOR Flash
+ * 0x04000000 - 0x05ffffff(CS1) | PLD           | PLD
+ * 0x06000000 - 0x07ffffff(CS1) | reserved      | I2C
+ * 0x08000000 - 0x0bffffff(CS2) | USB           | DDR SDRAM
+ * 0x0c000000 - 0x0fffffff(CS3) | SD            | DDR SDRAM
+ * 0x10000000 - 0x13ffffff(CS4) | SM107         | SM107
+ * 0x14000000 - 0x17ffffff(CS5) | I2C           | USB
+ * 0x18000000 - 0x1bffffff(CS6) | reserved      | SD
+ * 0x40000000 - 0x5fffffff      | DDR SDRAM     | (cannot use)
+ *
+ */
+
+#define NOR_FLASH_ADDR          0x00000000
+#define NOR_FLASH_SIZE          0x04000000
+
+#define PLD_BASE_ADDR           0x04000000
+#define PLD_PCICR               (PLD_BASE_ADDR + 0x00)
+#define PLD_LCD_BK_CONTR        (PLD_BASE_ADDR + 0x02)
+#define PLD_LOCALCR             (PLD_BASE_ADDR + 0x04)
+#define PLD_POFCR               (PLD_BASE_ADDR + 0x06)
+#define PLD_LEDCR               (PLD_BASE_ADDR + 0x08)
+#define PLD_SWSR                (PLD_BASE_ADDR + 0x0a)
+#define PLD_VERSR               (PLD_BASE_ADDR + 0x0c)
+#define PLD_MMSR                (PLD_BASE_ADDR + 0x0e)
+
+#define SM107_MEM_ADDR          0x10000000
+#define SM107_MEM_SIZE          0x00e00000
+#define SM107_REG_ADDR          0x13e00000
+#define SM107_REG_SIZE          0x00200000
+
+#if defined(CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS)
+#define R8A66597_ADDR           0x14000000      /* USB */
+#define CG200_ADDR              0x18000000      /* SD */
+#define PCA9564_ADDR            0x06000000      /* I2C */
+#else
+#define R8A66597_ADDR           0x08000000
+#define CG200_ADDR              0x0c000000
+#define PCA9564_ADDR            0x14000000
+#endif
+
+#define R8A66597_SIZE           0x00000100
+#define CG200_SIZE              0x00010000
+#define PCA9564_SIZE            0x00000100
+
+#endif  /* __ASM_SH_RENESAS_SH7785LCR_H */
+
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index e65b6b822cb3..056d68cd2108 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -148,14 +148,6 @@ extern unsigned long cached_to_uncached;
 
 extern struct dentry *sh_debugfs_root;
 
-/* XXX
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-void disable_hlt(void);
-void enable_hlt(void);
-
-void default_idle(void);
 void per_cpu_trap_init(void);
 
 asmlinkage void break_point_trap(void);
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 5131e3907525..eeb4c747119e 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -38,6 +38,8 @@ struct thread_info {
 #define THREAD_SIZE_ORDER       (1)
 #elif defined(CONFIG_PAGE_SIZE_8KB)
 #define THREAD_SIZE_ORDER       (1)
+#elif defined(CONFIG_PAGE_SIZE_16KB)
+#define THREAD_SIZE_ORDER       (0)
 #elif defined(CONFIG_PAGE_SIZE_64KB)
 #define THREAD_SIZE_ORDER       (0)
 #else
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index 701ba84c7049..327f7eb8976a 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -40,6 +40,5 @@ struct sys_timer *get_sys_timer(void);
 /* arch/sh/kernel/time.c */
 void handle_timer_tick(void);
 extern unsigned long sh_hpt_frequency;
-extern struct clocksource clocksource_sh;
 
 #endif /* __ASM_SH_TIMER_H */
diff --git a/include/asm-sh/uaccess.h b/include/asm-sh/uaccess.h
index b3440c305b5d..45c2c9b2993d 100644
--- a/include/asm-sh/uaccess.h
+++ b/include/asm-sh/uaccess.h
@@ -1,12 +1,171 @@
 #ifndef __ASM_SH_UACCESS_H
 #define __ASM_SH_UACCESS_H
 
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <asm/segment.h>
+
+#define VERIFY_READ    0
+#define VERIFY_WRITE   1
+
+#define __addr_ok(addr) \
+        ((unsigned long __force)(addr) < current_thread_info()->addr_limit.seg)
+
+/*
+ * __access_ok: Check if address with size is OK or not.
+ *
+ * Uhhuh, this needs 33-bit arithmetic. We have a carry..
+ *
+ * sum := addr + size;  carry? --> flag = true;
+ * if (sum >= addr_limit) flag = true;
+ */
+#define __access_ok(addr, size)         \
+        (__addr_ok((addr) + (size)))
+#define access_ok(type, addr, size)     \
+        (__chk_user_ptr(addr),          \
+         __access_ok((unsigned long __force)(addr), (size)))
+
+/*
+ * Uh, these should become the main single-value transfer routines ...
+ * They automatically use the right size if we just have the right
+ * pointer type ...
+ *
+ * As SuperH uses the same address space for kernel and user data, we
+ * can just do these as direct assignments.
+ *
+ * Careful to not
+ * (a) re-use the arguments for side effects (sizeof is ok)
+ * (b) require any knowledge of processes at this stage
+ */
+#define put_user(x,ptr)         __put_user_check((x), (ptr), sizeof(*(ptr)))
+#define get_user(x,ptr)         __get_user_check((x), (ptr), sizeof(*(ptr)))
+
+/*
+ * The "__xxx" versions do not do address space checking, useful when
+ * doing multiple accesses to the same area (the user has to do the
+ * checks by hand with "access_ok()")
+ */
+#define __put_user(x,ptr)       __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
+#define __get_user(x,ptr)       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
+
+struct __large_struct { unsigned long buf[100]; };
+#define __m(x) (*(struct __large_struct __user *)(x))
+
+#define __get_user_nocheck(x,ptr,size)                          \
+({                                                              \
+        long __gu_err;                                          \
+        unsigned long __gu_val;                                 \
+        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
+        __chk_user_ptr(ptr);                                    \
+        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+        (x) = (__typeof__(*(ptr)))__gu_val;                     \
+        __gu_err;                                               \
+})
+
+#define __get_user_check(x,ptr,size)                                    \
+({                                                                      \
+        long __gu_err = -EFAULT;                                        \
+        unsigned long __gu_val = 0;                                     \
+        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
+        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
+                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+
+#define __put_user_nocheck(x,ptr,size)                          \
+({                                                              \
+        long __pu_err;                                          \
+        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+        __chk_user_ptr(ptr);                                    \
+        __put_user_size((x), __pu_addr, (size), __pu_err);      \
+        __pu_err;                                               \
+})
+
+#define __put_user_check(x,ptr,size)                            \
+({                                                              \
+        long __pu_err = -EFAULT;                                \
+        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+        if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))   \
+                __put_user_size((x), __pu_addr, (size),         \
+                                __pu_err);                      \
+        __pu_err;                                               \
+})
+
 #ifdef CONFIG_SUPERH32
 # include "uaccess_32.h"
 #else
 # include "uaccess_64.h"
 #endif
 
+/* Generic arbitrary sized copy.  */
+/* Return the number of bytes NOT copied */
+__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
+
+static __always_inline unsigned long
+__copy_from_user(void *to, const void __user *from, unsigned long n)
+{
+        return __copy_user(to, (__force void *)from, n);
+}
+
+static __always_inline unsigned long __must_check
+__copy_to_user(void __user *to, const void *from, unsigned long n)
+{
+        return __copy_user((__force void *)to, from, n);
+}
+
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
+/*
+ * Clear the area and return remaining number of bytes
+ * (on failure.  Usually it's 0.)
+ */
+__kernel_size_t __clear_user(void *addr, __kernel_size_t size);
+
+#define clear_user(addr,n)                                              \
+({                                                                      \
+        void __user * __cl_addr = (addr);                               \
+        unsigned long __cl_size = (n);                                  \
+                                                                        \
+        if (__cl_size && access_ok(VERIFY_WRITE,                        \
+                ((unsigned long)(__cl_addr)), __cl_size))               \
+                __cl_size = __clear_user(__cl_addr, __cl_size);         \
+                                                                        \
+        __cl_size;                                                      \
+})
+
+/**
+ * strncpy_from_user: - Copy a NUL terminated string from userspace.
+ * @dst:   Destination address, in kernel space.  This buffer must be at
+ *         least @count bytes long.
+ * @src:   Source address, in user space.
+ * @count: Maximum number of bytes to copy, including the trailing NUL.
+ *
+ * Copies a NUL-terminated string from userspace to kernel space.
+ *
+ * On success, returns the length of the string (not including the trailing
+ * NUL).
+ *
+ * If access to userspace fails, returns -EFAULT (some data may have been
+ * copied).
+ *
+ * If @count is smaller than the length of the string, copies @count bytes
+ * and returns @count.
+ */
+#define strncpy_from_user(dest,src,count)                               \
+({                                                                      \
+        unsigned long __sfu_src = (unsigned long)(src);                 \
+        int __sfu_count = (int)(count);                                 \
+        long __sfu_res = -EFAULT;                                       \
+                                                                        \
+        if (__access_ok(__sfu_src, __sfu_count))                        \
+                __sfu_res = __strncpy_from_user((unsigned long)(dest),  \
+                                __sfu_src, __sfu_count);                \
+                                                                        \
+        __sfu_res;                                                      \
+})
+
 static inline unsigned long
 copy_from_user(void *to, const void __user *from, unsigned long n)
 {
@@ -31,4 +190,67 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
         return __copy_size;
 }
 
+/**
+ * strnlen_user: - Get the size of a string in user space.
+ * @s: The string to measure.
+ * @n: The maximum valid length
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ * If the string is too long, returns a value greater than @n.
+ */
+static inline long strnlen_user(const char __user *s, long n)
+{
+        if (!__addr_ok(s))
+                return 0;
+        else
+                return __strnlen_user(s, n);
+}
+
+/**
+ * strlen_user: - Get the size of a string in user space.
+ * @str: The string to measure.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ *
+ * If there is a limit on the length of a valid string, you may wish to
+ * consider using strnlen_user() instead.
+ */
+#define strlen_user(str)        strnlen_user(str, ~0UL >> 1)
+
+/*
+ * The exception table consists of pairs of addresses: the first is the
+ * address of an instruction that is allowed to fault, and the second is
+ * the address at which the program should continue.  No registers are
+ * modified, so it is entirely up to the continuation code to figure out
+ * what to do.
+ *
+ * All the routines below use bits of fixup code that are out of line
+ * with the main instruction path.  This means when everything is well,
+ * we don't even have to jump over them.  Further, they do not intrude
+ * on our cache or tlb entries.
+ */
+struct exception_table_entry {
+        unsigned long insn, fixup;
+};
+
+#if defined(CONFIG_SUPERH64) && defined(CONFIG_MMU)
+#define ARCH_HAS_SEARCH_EXTABLE
+#endif
+
+int fixup_exception(struct pt_regs *regs);
+/* Returns 0 if exception not found and fixup.unit otherwise.  */
+unsigned long search_exception_table(unsigned long addr);
+const struct exception_table_entry *search_exception_tables(unsigned long addr);
+
+
 #endif /* __ASM_SH_UACCESS_H */
diff --git a/include/asm-sh/uaccess_32.h b/include/asm-sh/uaccess_32.h
index 1e41fda74bd3..892fd6dea9db 100644
--- a/include/asm-sh/uaccess_32.h
+++ b/include/asm-sh/uaccess_32.h
@@ -1,9 +1,8 @@
-/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $
- *
+/*
  * User space memory access functions
  *
  * Copyright (C) 1999, 2002  Niibe Yutaka
- * Copyright (C) 2003  Paul Mundt
+ * Copyright (C) 2003 - 2008  Paul Mundt
  *
  *  Based on:
  *     MIPS implementation version 1.15 by
@@ -13,115 +12,6 @@
 #ifndef __ASM_SH_UACCESS_32_H
 #define __ASM_SH_UACCESS_32_H
 
-#include <linux/errno.h>
-#include <linux/sched.h>
-
-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFFUL)
-#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#define get_ds()        (KERNEL_DS)
-
-#if !defined(CONFIG_MMU)
-/* NOMMU is always true */
-#define __addr_ok(addr) (1)
-
-static inline mm_segment_t get_fs(void)
-{
-        return USER_DS;
-}
-
-static inline void set_fs(mm_segment_t s)
-{
-}
-
-/*
- * __access_ok: Check if address with size is OK or not.
- *
- * If we don't have an MMU (or if its disabled) the only thing we really have
- * to look out for is if the address resides somewhere outside of what
- * available RAM we have.
- */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-        return 1;
-}
-#else /* CONFIG_MMU */
-#define __addr_ok(addr) \
-        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-
-/*
- * __access_ok: Check if address with size is OK or not.
- *
- * Uhhuh, this needs 33-bit arithmetic. We have a carry..
- *
- * sum := addr + size;  carry? --> flag = true;
- * if (sum >= addr_limit) flag = true;
- */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-        unsigned long flag, sum;
-
-        __asm__("clrt\n\t"
-                "addc   %3, %1\n\t"
-                "movt   %0\n\t"
-                "cmp/hi %4, %1\n\t"
-                "rotcl  %0"
-                :"=&r" (flag), "=r" (sum)
-                :"1" (addr), "r" (size),
-                 "r" (current_thread_info()->addr_limit.seg)
-                :"t");
-        return flag == 0;
-}
-#endif /* CONFIG_MMU */
-
-#define access_ok(type, addr, size)     \
-        (__chk_user_ptr(addr),          \
-         __access_ok((unsigned long __force)(addr), (size)))
-
-/*
- * Uh, these should become the main single-value transfer routines ...
- * They automatically use the right size if we just have the right
- * pointer type ...
- *
- * As SuperH uses the same address space for kernel and user data, we
- * can just do these as direct assignments.
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof is ok)
- * (b) require any knowledge of processes at this stage
- */
-#define put_user(x,ptr)         __put_user_check((x), (ptr), sizeof(*(ptr)))
-#define get_user(x,ptr)         __get_user_check((x), (ptr), sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x,ptr)       __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
-#define __get_user(x,ptr)       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct __user *)(x))
-
 #define __get_user_size(x,ptr,size,retval)                      \
 do {                                                            \
         retval = 0;                                             \
@@ -141,28 +31,7 @@ do {								\
         }                                                       \
 } while (0)
 
-#define __get_user_nocheck(x,ptr,size)                          \
-({                                                              \
-        long __gu_err;                                          \
-        unsigned long __gu_val;                                 \
-        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
-        __chk_user_ptr(ptr);                                    \
-        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
-        __gu_err;                                               \
-})
-
-#define __get_user_check(x,ptr,size)                                    \
-({                                                                      \
-        long __gu_err = -EFAULT;                                        \
-        unsigned long __gu_val = 0;                                     \
-        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
-        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
-                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-        __gu_err;                                                       \
-})
-
+#ifdef CONFIG_MMU
 #define __get_user_asm(x, addr, err, insn) \
 ({ \
 __asm__ __volatile__( \
@@ -183,6 +52,16 @@ __asm__ __volatile__( \
         ".previous" \
         :"=&r" (err), "=&r" (x) \
         :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
+#else
+#define __get_user_asm(x, addr, err, insn)              \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+                "mov." insn "   %1, %0\n\t"             \
+                : "=&r" (x)                             \
+                : "m" (__m(addr))                       \
+        );                                              \
+} while (0)
+#endif /* CONFIG_MMU */
 
 extern void __get_user_unknown(void);
 
@@ -197,7 +76,8 @@ do {							\
                 __put_user_asm(x, ptr, retval, "w");    \
                 break;                                  \
         case 4:                                         \
-                __put_user_asm(x, ptr, retval, "l");    \
+                __put_user_asm((u32)x, ptr,             \
+                               retval, "l");            \
                 break;                                  \
         case 8:                                         \
                 __put_user_u64(x, ptr, retval);         \
@@ -207,45 +87,41 @@ do {							\
         }                                               \
 } while (0)
 
-#define __put_user_nocheck(x,ptr,size)                          \
-({                                                              \
-        long __pu_err;                                          \
-        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-        __chk_user_ptr(ptr);                                    \
-        __put_user_size((x), __pu_addr, (size), __pu_err);      \
-        __pu_err;                                               \
-})
-
-#define __put_user_check(x,ptr,size)                            \
-({                                                              \
-        long __pu_err = -EFAULT;                                \
-        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-        if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))   \
-                __put_user_size((x), __pu_addr, (size),         \
-                                __pu_err);                      \
-        __pu_err;                                               \
-})
-
-#define __put_user_asm(x, addr, err, insn) \
-({ \
-__asm__ __volatile__( \
-        "1:\n\t" \
-        "mov." insn "   %1, %2\n\t" \
-        "2:\n" \
-        ".section       .fixup,\"ax\"\n" \
-        "3:\n\t" \
-        "mov.l  4f, %0\n\t" \
-        "jmp    @%0\n\t" \
-        " mov   %3, %0\n\t" \
-        ".balign        4\n" \
-        "4:     .long   2b\n\t" \
-        ".previous\n" \
-        ".section       __ex_table,\"a\"\n\t" \
-        ".long  1b, 3b\n\t" \
-        ".previous" \
-        :"=&r" (err) \
-        :"r" (x), "m" (__m(addr)), "i" (-EFAULT), "0" (err)     \
-        :"memory"); })
+#ifdef CONFIG_MMU
+#define __put_user_asm(x, addr, err, insn)                      \
+do {                                                            \
+        __asm__ __volatile__ (                                  \
+                "1:\n\t"                                        \
+                "mov." insn "   %1, %2\n\t"                     \
+                "2:\n"                                          \
+                ".section       .fixup,\"ax\"\n"                \
+                "3:\n\t"                                        \
+                "mov.l  4f, %0\n\t"                             \
+                "jmp    @%0\n\t"                                \
+                " mov   %3, %0\n\t"                             \
+                ".balign        4\n"                            \
+                "4:     .long   2b\n\t"                         \
+                ".previous\n"                                   \
+                ".section       __ex_table,\"a\"\n\t"           \
+                ".long  1b, 3b\n\t"                             \
+                ".previous"                                     \
+                : "=&r" (err)                                   \
+                : "r" (x), "m" (__m(addr)), "i" (-EFAULT),      \
+                  "0" (err)                                     \
+                : "memory"                                      \
+        );                                                      \
+} while (0)
+#else
+#define __put_user_asm(x, addr, err, insn)              \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+                "mov." insn "   %0, %1\n\t"             \
+                : /* no outputs */                      \
+                : "r" (x), "m" (__m(addr))              \
+                : "memory"                              \
+        );                                              \
+} while (0)
+#endif /* CONFIG_MMU */
 
 #if defined(CONFIG_CPU_LITTLE_ENDIAN)
 #define __put_user_u64(val,addr,retval) \
@@ -295,40 +171,7 @@ __asm__ __volatile__( \
 
 extern void __put_user_unknown(void);
 
-/* Generic arbitrary sized copy.  */
-/* Return the number of bytes NOT copied */
-__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
-
-
-static __always_inline unsigned long
-__copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        return __copy_user(to, (__force void *)from, n);
-}
-
-static __always_inline unsigned long __must_check
-__copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        return __copy_user((__force void *)to, from, n);
-}
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/*
- * Clear the area and return remaining number of bytes
- * (on failure.  Usually it's 0.)
- */
-extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
-
-#define clear_user(addr,n) ({ \
-void * __cl_addr = (addr); \
-unsigned long __cl_size = (n); \
-if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
-__cl_size = __clear_user(__cl_addr, __cl_size); \
-__cl_size; })
-
-static __inline__ int
+static inline int
 __strncpy_from_user(unsigned long __dest, unsigned long __user __src, int __count)
 {
         __kernel_size_t res;
@@ -367,37 +210,11 @@ __strncpy_from_user(unsigned long __dest, unsigned long __user __src, int __coun
         return res;
 }
 
-/**
- * strncpy_from_user: - Copy a NUL terminated string from userspace.
- * @dst:   Destination address, in kernel space.  This buffer must be at
- *         least @count bytes long.
- * @src:   Source address, in user space.
- * @count: Maximum number of bytes to copy, including the trailing NUL.
- *
- * Copies a NUL-terminated string from userspace to kernel space.
- *
- * On success, returns the length of the string (not including the trailing
- * NUL).
- *
- * If access to userspace fails, returns -EFAULT (some data may have been
- * copied).
- *
- * If @count is smaller than the length of the string, copies @count bytes
- * and returns @count.
- */
-#define strncpy_from_user(dest,src,count) ({ \
-unsigned long __sfu_src = (unsigned long) (src); \
-int __sfu_count = (int) (count); \
-long __sfu_res = -EFAULT; \
-if(__access_ok(__sfu_src, __sfu_count)) { \
-__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
-} __sfu_res; })
-
 /*
  * Return the size of a string (including the ending 0 even when we have
  * exceeded the maximum string length).
  */
-static __inline__ long __strnlen_user(const char __user *__s, long __n)
+static inline long __strnlen_user(const char __user *__s, long __n)
 {
         unsigned long res;
         unsigned long __dummy;
@@ -429,61 +246,4 @@ static __inline__ long __strnlen_user(const char __user *__s, long __n)
         return res;
 }
 
-/**
- * strnlen_user: - Get the size of a string in user space.
- * @s: The string to measure.
- * @n: The maximum valid length
- *
- * Context: User context only.  This function may sleep.
- *
- * Get the size of a NUL-terminated string in user space.
- *
- * Returns the size of the string INCLUDING the terminating NUL.
- * On exception, returns 0.
- * If the string is too long, returns a value greater than @n.
- */
-static __inline__ long strnlen_user(const char __user *s, long n)
-{
-        if (!__addr_ok(s))
-                return 0;
-        else
-                return __strnlen_user(s, n);
-}
-
-/**
- * strlen_user: - Get the size of a string in user space.
- * @str: The string to measure.
- *
- * Context: User context only.  This function may sleep.
- *
- * Get the size of a NUL-terminated string in user space.
- *
- * Returns the size of the string INCLUDING the terminating NUL.
- * On exception, returns 0.
- *
- * If there is a limit on the length of a valid string, you may wish to
- * consider using strnlen_user() instead.
- */
-#define strlen_user(str)        strnlen_user(str, ~0UL >> 1)
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-extern int fixup_exception(struct pt_regs *regs);
-
 #endif /* __ASM_SH_UACCESS_32_H */
diff --git a/include/asm-sh/uaccess_64.h b/include/asm-sh/uaccess_64.h
index a9b68d094844..81b3d515fcb3 100644
--- a/include/asm-sh/uaccess_64.h
+++ b/include/asm-sh/uaccess_64.h
@@ -20,87 +20,6 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-#include <linux/errno.h>
-#include <linux/sched.h>
-
-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS         MAKE_MM_SEG(0x80000000)
-
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit=(x))
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#define __addr_ok(addr) ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-/*
- * Uhhuh, this needs 33-bit arithmetic. We have a carry..
- *
- * sum := addr + size;  carry? --> flag = true;
- * if (sum >= addr_limit) flag = true;
- */
-#define __range_ok(addr,size) (((unsigned long) (addr) + (size) < (current_thread_info()->addr_limit.seg)) ? 0 : 1)
-
-#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
-#define __access_ok(addr,size) (__range_ok(addr,size) == 0)
-
-/*
- * Uh, these should become the main single-value transfer routines ...
- * They automatically use the right size if we just have the right
- * pointer type ...
- *
- * As MIPS uses the same address space for kernel and user data, we
- * can just do these as direct assignments.
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof is ok)
- * (b) require any knowledge of processes at this stage
- */
-#define put_user(x,ptr) __put_user_check((x),(ptr),sizeof(*(ptr)))
-#define get_user(x,ptr) __get_user_check((x),(ptr),sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x,ptr) __put_user_nocheck((x),(ptr),sizeof(*(ptr)))
-#define __get_user(x,ptr) __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
-
-/*
- * The "xxx_ret" versions return constant specified in third argument, if
- * something bad happens. These macros can be optimized for the
- * case of just returning from the function xxx_ret is used.
- */
-
-#define put_user_ret(x,ptr,ret) ({ \
-if (put_user(x,ptr)) return ret; })
-
-#define get_user_ret(x,ptr,ret) ({ \
-if (get_user(x,ptr)) return ret; })
-
-#define __put_user_ret(x,ptr,ret) ({ \
-if (__put_user(x,ptr)) return ret; })
-
-#define __get_user_ret(x,ptr,ret) ({ \
-if (__get_user(x,ptr)) return ret; })
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
 
 #define __get_user_size(x,ptr,size,retval)                      \
 do {                                                            \
@@ -124,26 +43,6 @@ do {								\
         }                                                       \
 } while (0)
 
-#define __get_user_nocheck(x,ptr,size)                          \
-({                                                              \
-        long __gu_err, __gu_val;                                \
-        __get_user_size((void *)&__gu_val, (long)(ptr),         \
-                        (size), __gu_err);                      \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
-        __gu_err;                                               \
-})
-
-#define __get_user_check(x,ptr,size)                            \
-({                                                              \
-        long __gu_addr = (long)(ptr);                           \
-        long __gu_err = -EFAULT, __gu_val;                      \
-        if (__access_ok(__gu_addr, (size)))                     \
-                __get_user_size((void *)&__gu_val, __gu_addr,   \
-                                (size), __gu_err);              \
-        (x) = (__typeof__(*(ptr))) __gu_val;                    \
-        __gu_err;                                               \
-})
-
 extern long __get_user_asm_b(void *, long);
 extern long __get_user_asm_w(void *, long);
 extern long __get_user_asm_l(void *, long);
@@ -171,115 +70,10 @@ do {								\
         }                                                       \
 } while (0)
 
-#define __put_user_nocheck(x,ptr,size)                          \
-({                                                              \
-        long __pu_err;                                          \
-        __typeof__(*(ptr)) __pu_val = (x);                      \
-        __put_user_size((void *)&__pu_val, (long)(ptr), (size), __pu_err); \
-        __pu_err;                                               \
-})
-
-#define __put_user_check(x,ptr,size)                            \
-({                                                              \
-        long __pu_err = -EFAULT;                                \
-        long __pu_addr = (long)(ptr);                           \
-        __typeof__(*(ptr)) __pu_val = (x);                      \
-                                                                \
-        if (__access_ok(__pu_addr, (size)))                     \
-                __put_user_size((void *)&__pu_val, __pu_addr, (size), __pu_err);\
-        __pu_err;                                               \
-})
-
 extern long __put_user_asm_b(void *, long);
 extern long __put_user_asm_w(void *, long);
 extern long __put_user_asm_l(void *, long);
 extern long __put_user_asm_q(void *, long);
 extern void __put_user_unknown(void);
 
-
-/* Generic arbitrary sized copy.  */
-/* Return the number of bytes NOT copied */
-/* XXX: should be such that: 4byte and the rest. */
-extern __kernel_size_t __copy_user(void *__to, const void *__from, __kernel_size_t __n);
-
-#define copy_to_user_ret(to,from,n,retval) ({ \
-if (copy_to_user(to,from,n)) \
-        return retval; \
-})
-
-#define __copy_to_user(to,from,n)               \
-        __copy_user((void *)(to),               \
-                    (void *)(from), n)
-
-#define __copy_to_user_ret(to,from,n,retval) ({ \
-if (__copy_to_user(to,from,n)) \
-        return retval; \
-})
-
-#define copy_from_user_ret(to,from,n,retval) ({ \
-if (copy_from_user(to,from,n)) \
-        return retval; \
-})
-
-#define __copy_from_user(to,from,n)             \
-        __copy_user((void *)(to),               \
-                    (void *)(from), n)
-
-#define __copy_from_user_ret(to,from,n,retval) ({ \
-if (__copy_from_user(to,from,n)) \
-        return retval; \
-})
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/* XXX: Not sure it works well..
-   should be such that: 4byte clear and the rest. */
-extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
-
-#define clear_user(addr,n) ({ \
-void * __cl_addr = (addr); \
-unsigned long __cl_size = (n); \
-if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
-__cl_size = __clear_user(__cl_addr, __cl_size); \
-__cl_size; })
-
-extern int __strncpy_from_user(unsigned long __dest, unsigned long __src, int __count);
-
-#define strncpy_from_user(dest,src,count) ({ \
-unsigned long __sfu_src = (unsigned long) (src); \
-int __sfu_count = (int) (count); \
-long __sfu_res = -EFAULT; \
-if(__access_ok(__sfu_src, __sfu_count)) { \
-__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
-} __sfu_res; })
-
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
-
-/*
- * Return the size of a string (including the ending 0!)
- */
-extern long __strnlen_user(const char *__s, long __n);
-
-static inline long strnlen_user(const char *s, long n)
-{
-        if (!__addr_ok(s))
-                return 0;
-        else
-                return __strnlen_user(s, n);
-}
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-#ifdef CONFIG_MMU
-#define ARCH_HAS_SEARCH_EXTABLE
-#endif
-
-/* Returns 0 if exception not found and fixup.unit otherwise.  */
-extern unsigned long search_exception_table(unsigned long addr);
-extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
-
 #endif /* __ASM_SH_UACCESS_64_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 4b21f369c28c..65be656ead7d 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -1,5 +1,13 @@
-#ifdef CONFIG_SUPERH32
-# include "unistd_32.h"
+#ifdef __KERNEL__
+# ifdef CONFIG_SUPERH32
+#  include "unistd_32.h"
+# else
+#  include "unistd_64.h"
+# endif
 #else
-# include "unistd_64.h"
+# ifdef __SH5__
+#  include "unistd_64.h"
+# else
+#  include "unistd_32.h"
+# endif
 #endif
diff --git a/include/asm-sh/unistd_32.h b/include/asm-sh/unistd_32.h
index 0b07212ec659..d52c000cf924 100644
--- a/include/asm-sh/unistd_32.h
+++ b/include/asm-sh/unistd_32.h
@@ -335,8 +335,14 @@
 #define __NR_fallocate          324
 #define __NR_timerfd_settime    325
 #define __NR_timerfd_gettime    326
+#define __NR_signalfd4          327
+#define __NR_eventfd2           328
+#define __NR_epoll_create1      329
+#define __NR_dup3               330
+#define __NR_pipe2              331
+#define __NR_inotify_init1      332
 
-#define NR_syscalls 327
+#define NR_syscalls 333
 
 #ifdef __KERNEL__
 
diff --git a/include/asm-sh/unistd_64.h b/include/asm-sh/unistd_64.h
index 9d21eab52427..7c54e91753c1 100644
--- a/include/asm-sh/unistd_64.h
+++ b/include/asm-sh/unistd_64.h
@@ -375,10 +375,16 @@
 #define __NR_fallocate          352
 #define __NR_timerfd_settime    353
 #define __NR_timerfd_gettime    354
+#define __NR_signalfd4          355
+#define __NR_eventfd2           356
+#define __NR_epoll_create1      357
+#define __NR_dup3               358
+#define __NR_pipe2              359
+#define __NR_inotify_init1      360
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 353
+#define NR_syscalls 361
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
deleted file mode 100644
index 6cdaf9d33b38..000000000000
--- a/include/asm-sparc/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-# dummy file to avoid breaking make headers_install
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
deleted file mode 100644
index 6cdaf9d33b38..000000000000
--- a/include/asm-sparc64/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-# dummy file to avoid breaking make headers_install
diff --git a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h
deleted file mode 100644
index eb8d4b3f5163..000000000000
--- a/include/asm-sparc64/agp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/agp.h>
diff --git a/include/asm-sparc64/apb.h b/include/asm-sparc64/apb.h
deleted file mode 100644
index 5e236ca6e492..000000000000
--- a/include/asm-sparc64/apb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/apb.h>
diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h
deleted file mode 100644
index 9b7110c516e8..000000000000
--- a/include/asm-sparc64/asi.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/asi.h>
diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h
deleted file mode 100644
index f5126826ba34..000000000000
--- a/include/asm-sparc64/atomic.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/atomic.h>
diff --git a/include/asm-sparc64/auxio.h b/include/asm-sparc64/auxio.h
deleted file mode 100644
index 46c9042f30b4..000000000000
--- a/include/asm-sparc64/auxio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/auxio.h>
diff --git a/include/asm-sparc64/auxvec.h b/include/asm-sparc64/auxvec.h
deleted file mode 100644
index 1f45c67d7316..000000000000
--- a/include/asm-sparc64/auxvec.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/auxvec.h>
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h
deleted file mode 100644
index 8ee26d947e0e..000000000000
--- a/include/asm-sparc64/backoff.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/backoff.h>
diff --git a/include/asm-sparc64/bbc.h b/include/asm-sparc64/bbc.h
deleted file mode 100644
index 06e8b6306514..000000000000
--- a/include/asm-sparc64/bbc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bbc.h>
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h
deleted file mode 100644
index 204404355bdd..000000000000
--- a/include/asm-sparc64/bitops.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bitops.h>
diff --git a/include/asm-sparc64/bpp.h b/include/asm-sparc64/bpp.h
deleted file mode 100644
index 514eee20272e..000000000000
--- a/include/asm-sparc64/bpp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bpp.h>
diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h
deleted file mode 100644
index 3433737c7a67..000000000000
--- a/include/asm-sparc64/bug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bug.h>
diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h
deleted file mode 100644
index 04ae9e2818cf..000000000000
--- a/include/asm-sparc64/bugs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bugs.h>
diff --git a/include/asm-sparc64/byteorder.h b/include/asm-sparc64/byteorder.h
deleted file mode 100644
index f672855bee17..000000000000
--- a/include/asm-sparc64/byteorder.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/byteorder.h>
diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h
deleted file mode 100644
index fa9de5cadbf1..000000000000
--- a/include/asm-sparc64/cache.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cache.h>
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
deleted file mode 100644
index cf5b6b3e8a55..000000000000
--- a/include/asm-sparc64/cacheflush.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cacheflush.h>
diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h
deleted file mode 100644
index aaab97562a39..000000000000
--- a/include/asm-sparc64/chafsr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/chafsr.h>
diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h
deleted file mode 100644
index c3966c5e29d8..000000000000
--- a/include/asm-sparc64/checksum.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/checksum.h>
diff --git a/include/asm-sparc64/chmctrl.h b/include/asm-sparc64/chmctrl.h
deleted file mode 100644
index eb757b483b30..000000000000
--- a/include/asm-sparc64/chmctrl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/chmctrl.h>
diff --git a/include/asm-sparc64/cmt.h b/include/asm-sparc64/cmt.h
deleted file mode 100644
index b19b445cb810..000000000000
--- a/include/asm-sparc64/cmt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cmt.h>
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
deleted file mode 100644
index 8c155d221952..000000000000
--- a/include/asm-sparc64/compat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/compat.h>
diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h
deleted file mode 100644
index 7187dcc8cac7..000000000000
--- a/include/asm-sparc64/compat_signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/compat_signal.h>
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
deleted file mode 100644
index 3220e134a579..000000000000
--- a/include/asm-sparc64/cpudata.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cpudata.h>
diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
deleted file mode 100644
index 435f37a92f7c..000000000000
--- a/include/asm-sparc64/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cputime.h>
diff --git a/include/asm-sparc64/current.h b/include/asm-sparc64/current.h
deleted file mode 100644
index a7904a7f53a8..000000000000
--- a/include/asm-sparc64/current.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/current.h>
diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h
deleted file mode 100644
index d67613b1f5fe..000000000000
--- a/include/asm-sparc64/dcr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dcr.h>
diff --git a/include/asm-sparc64/dcu.h b/include/asm-sparc64/dcu.h
deleted file mode 100644
index 28853f4968d1..000000000000
--- a/include/asm-sparc64/dcu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dcu.h>
diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h
deleted file mode 100644
index 33dc5589d841..000000000000
--- a/include/asm-sparc64/delay.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/delay.h>
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h
deleted file mode 100644
index 4145c47097e2..000000000000
--- a/include/asm-sparc64/device.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/device.h>
diff --git a/include/asm-sparc64/display7seg.h b/include/asm-sparc64/display7seg.h
deleted file mode 100644
index e74f046b41de..000000000000
--- a/include/asm-sparc64/display7seg.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/display7seg.h>
diff --git a/include/asm-sparc64/div64.h b/include/asm-sparc64/div64.h
deleted file mode 100644
index 928c94f99ecf..000000000000
--- a/include/asm-sparc64/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/div64.h>
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
deleted file mode 100644
index 380b7b63147f..000000000000
--- a/include/asm-sparc64/dma-mapping.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dma-mapping.h>
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h
deleted file mode 100644
index 2e36248e6b59..000000000000
--- a/include/asm-sparc64/dma.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dma.h>
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h
deleted file mode 100644
index d7d476158bd5..000000000000
--- a/include/asm-sparc64/ebus.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ebus.h>
diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h
deleted file mode 100644
index f256d9472c82..000000000000
--- a/include/asm-sparc64/elf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/elf.h>
diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h
deleted file mode 100644
index 2cac7b644da8..000000000000
--- a/include/asm-sparc64/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/emergency-restart.h>
diff --git a/include/asm-sparc64/envctrl.h b/include/asm-sparc64/envctrl.h
deleted file mode 100644
index a2cc0ca334ba..000000000000
--- a/include/asm-sparc64/envctrl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/envctrl.h>
diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h
deleted file mode 100644
index 9701fe01cc53..000000000000
--- a/include/asm-sparc64/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/errno.h>
diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h
deleted file mode 100644
index bedd0ef5f19c..000000000000
--- a/include/asm-sparc64/estate.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/estate.h>
diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h
deleted file mode 100644
index 1c2ac5832f39..000000000000
--- a/include/asm-sparc64/fb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fb.h>
diff --git a/include/asm-sparc64/fbio.h b/include/asm-sparc64/fbio.h
deleted file mode 100644
index c17edf8c7bc4..000000000000
--- a/include/asm-sparc64/fbio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fbio.h>
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
deleted file mode 100644
index 8b1beae48cd1..000000000000
--- a/include/asm-sparc64/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fcntl.h>
diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h
deleted file mode 100644
index 73eb04c19c47..000000000000
--- a/include/asm-sparc64/fhc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fhc.h>
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
deleted file mode 100644
index 214878114436..000000000000
--- a/include/asm-sparc64/floppy.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/floppy.h>
diff --git a/include/asm-sparc64/fpumacro.h b/include/asm-sparc64/fpumacro.h
deleted file mode 100644
index 30d6d0f68bc3..000000000000
--- a/include/asm-sparc64/fpumacro.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fpumacro.h>
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h
deleted file mode 100644
index 1ceb0bb2fe53..000000000000
--- a/include/asm-sparc64/futex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/futex.h>
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h
deleted file mode 100644
index 63dca3db11f3..000000000000
--- a/include/asm-sparc64/hardirq.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hardirq.h>
diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h
deleted file mode 100644
index 2254c09e53f9..000000000000
--- a/include/asm-sparc64/head.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/head.h>
diff --git a/include/asm-sparc64/hugetlb.h b/include/asm-sparc64/hugetlb.h
deleted file mode 100644
index 21d8f0a9c243..000000000000
--- a/include/asm-sparc64/hugetlb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hugetlb.h>
diff --git a/include/asm-sparc64/hvtramp.h b/include/asm-sparc64/hvtramp.h
deleted file mode 100644
index fb46bfe934a7..000000000000
--- a/include/asm-sparc64/hvtramp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hvtramp.h>
diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h
deleted file mode 100644
index 16920a291f51..000000000000
--- a/include/asm-sparc64/hw_irq.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hw_irq.h>
diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
deleted file mode 100644
index fe7e51a9e429..000000000000
--- a/include/asm-sparc64/hypervisor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hypervisor.h>
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
deleted file mode 100644
index 7125317a428d..000000000000
--- a/include/asm-sparc64/ide.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ide.h>
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h
deleted file mode 100644
index c22f9c30bc78..000000000000
--- a/include/asm-sparc64/idprom.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/idprom.h>
diff --git a/include/asm-sparc64/intr_queue.h b/include/asm-sparc64/intr_queue.h
deleted file mode 100644
index f7225015b3db..000000000000
--- a/include/asm-sparc64/intr_queue.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/intr_queue.h>
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
deleted file mode 100644
index 25ff258dfd33..000000000000
--- a/include/asm-sparc64/io.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/io.h>
diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h
deleted file mode 100644
index 18fc5623ff51..000000000000
--- a/include/asm-sparc64/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ioctl.h>
diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h
deleted file mode 100644
index dcd5540ec103..000000000000
--- a/include/asm-sparc64/ioctls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ioctls.h>
diff --git a/include/asm-sparc64/iommu.h b/include/asm-sparc64/iommu.h
deleted file mode 100644
index 76252bb85e97..000000000000
--- a/include/asm-sparc64/iommu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/iommu.h>
diff --git a/include/asm-sparc64/ipcbuf.h b/include/asm-sparc64/ipcbuf.h
deleted file mode 100644
index 41dfaf1149b5..000000000000
--- a/include/asm-sparc64/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ipcbuf.h>
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
deleted file mode 100644
index b2102e65947c..000000000000
--- a/include/asm-sparc64/irq.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irq.h>
diff --git a/include/asm-sparc64/irq_regs.h b/include/asm-sparc64/irq_regs.h
deleted file mode 100644
index 1e2b8a1e745a..000000000000
--- a/include/asm-sparc64/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irq_regs.h>
diff --git a/include/asm-sparc64/irqflags.h b/include/asm-sparc64/irqflags.h
deleted file mode 100644
index 27b091fc3fa0..000000000000
--- a/include/asm-sparc64/irqflags.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irqflags.h>
diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
deleted file mode 100644
index 78cfd5d2749b..000000000000
--- a/include/asm-sparc64/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kdebug.h>
diff --git a/include/asm-sparc64/kgdb.h b/include/asm-sparc64/kgdb.h
deleted file mode 100644
index aa6532fd3a13..000000000000
--- a/include/asm-sparc64/kgdb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kgdb.h>
diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
deleted file mode 100644
index 276530cf5395..000000000000
--- a/include/asm-sparc64/kmap_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kmap_types.h>
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
deleted file mode 100644
index c55e43e4d2a4..000000000000
--- a/include/asm-sparc64/kprobes.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kprobes.h>
diff --git a/include/asm-sparc64/ldc.h b/include/asm-sparc64/ldc.h
deleted file mode 100644
index 40f3f231c457..000000000000
--- a/include/asm-sparc64/ldc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ldc.h>
diff --git a/include/asm-sparc64/linkage.h b/include/asm-sparc64/linkage.h
deleted file mode 100644
index 3ea4fd13f193..000000000000
--- a/include/asm-sparc64/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/linkage.h>
diff --git a/include/asm-sparc64/lmb.h b/include/asm-sparc64/lmb.h
deleted file mode 100644
index 3d04981701e2..000000000000
--- a/include/asm-sparc64/lmb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/lmb.h>
diff --git a/include/asm-sparc64/local.h b/include/asm-sparc64/local.h
deleted file mode 100644
index c11c530f74d0..000000000000
--- a/include/asm-sparc64/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h
deleted file mode 100644
index 4e3d8b128a58..000000000000
--- a/include/asm-sparc64/lsu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/lsu.h>
diff --git a/include/asm-sparc64/mc146818rtc.h b/include/asm-sparc64/mc146818rtc.h
deleted file mode 100644
index 97842e6ed1c2..000000000000
--- a/include/asm-sparc64/mc146818rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mc146818rtc.h>
diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h
deleted file mode 100644
index 165a19347286..000000000000
--- a/include/asm-sparc64/mdesc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mdesc.h>
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h
deleted file mode 100644
index 17ddb1724f51..000000000000
--- a/include/asm-sparc64/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mman.h>
diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h
deleted file mode 100644
index e677a64d8db1..000000000000
--- a/include/asm-sparc64/mmu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmu.h>
diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h
deleted file mode 100644
index 877fee94bd4e..000000000000
--- a/include/asm-sparc64/mmu_context.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmu_context.h>
diff --git a/include/asm-sparc64/mmzone.h b/include/asm-sparc64/mmzone.h
deleted file mode 100644
index 43a710f7892a..000000000000
--- a/include/asm-sparc64/mmzone.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmzone.h>
diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h
deleted file mode 100644
index a9606db55e4a..000000000000
--- a/include/asm-sparc64/module.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/module.h>
diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h
deleted file mode 100644
index 95a752f7e875..000000000000
--- a/include/asm-sparc64/mostek.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mostek.h>
diff --git a/include/asm-sparc64/msgbuf.h b/include/asm-sparc64/msgbuf.h
deleted file mode 100644
index 5b33cc9d9bfb..000000000000
--- a/include/asm-sparc64/msgbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/msgbuf.h>
diff --git a/include/asm-sparc64/mutex.h b/include/asm-sparc64/mutex.h
deleted file mode 100644
index c0c0f8f260d6..000000000000
--- a/include/asm-sparc64/mutex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mutex.h>
diff --git a/include/asm-sparc64/ns87303.h b/include/asm-sparc64/ns87303.h
deleted file mode 100644
index 5f369d4df3db..000000000000
--- a/include/asm-sparc64/ns87303.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ns87303.h>
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h
deleted file mode 100644
index a769fdbe164a..000000000000
--- a/include/asm-sparc64/of_device.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/of_device.h>
diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h
deleted file mode 100644
index f7c427b8bc61..000000000000
--- a/include/asm-sparc64/of_platform.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/of_platform.h>
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h
deleted file mode 100644
index acf4b234fae3..000000000000
--- a/include/asm-sparc64/openprom.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/openprom.h>
diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h
deleted file mode 100644
index 122fabda21f1..000000000000
--- a/include/asm-sparc64/openpromio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/openpromio.h>
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h
deleted file mode 100644
index d93e44e63510..000000000000
--- a/include/asm-sparc64/oplib.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/oplib.h>
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
deleted file mode 100644
index f46c1fb53028..000000000000
--- a/include/asm-sparc64/page.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/page.h>
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h
deleted file mode 100644
index 40c6dc110822..000000000000
--- a/include/asm-sparc64/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/param.h>
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
deleted file mode 100644
index b4e4ca812eb6..000000000000
--- a/include/asm-sparc64/parport.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/parport.h>
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
deleted file mode 100644
index da54c4d1f39c..000000000000
--- a/include/asm-sparc64/pci.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pci.h>
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h
deleted file mode 100644
index 292729bb350f..000000000000
--- a/include/asm-sparc64/percpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/percpu.h>
diff --git a/include/asm-sparc64/perfctr.h b/include/asm-sparc64/perfctr.h
deleted file mode 100644
index 52073a9f8e30..000000000000
--- a/include/asm-sparc64/perfctr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/perfctr.h>
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h
deleted file mode 100644
index bec31641011c..000000000000
--- a/include/asm-sparc64/pgalloc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pgalloc.h>
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
deleted file mode 100644
index 9decbd99aeff..000000000000
--- a/include/asm-sparc64/pgtable.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pgtable.h>
diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h
deleted file mode 100644
index d805f33f1e0f..000000000000
--- a/include/asm-sparc64/pil.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pil.h>
diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h
deleted file mode 100644
index 8e2f31b4641a..000000000000
--- a/include/asm-sparc64/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/poll.h>
diff --git a/include/asm-sparc64/posix_types.h b/include/asm-sparc64/posix_types.h
deleted file mode 100644
index 8cee99200232..000000000000
--- a/include/asm-sparc64/posix_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/posix_types.h>
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h
deleted file mode 100644
index 21de6cc182eb..000000000000
--- a/include/asm-sparc64/processor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/processor.h>
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h
deleted file mode 100644
index 5fa166ee3ffa..000000000000
--- a/include/asm-sparc64/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/prom.h>
diff --git a/include/asm-sparc64/psrcompat.h b/include/asm-sparc64/psrcompat.h
deleted file mode 100644
index 587846f48358..000000000000
--- a/include/asm-sparc64/psrcompat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/psrcompat.h>
diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h
deleted file mode 100644
index 3ccf0be25360..000000000000
--- a/include/asm-sparc64/pstate.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pstate.h>
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
deleted file mode 100644
index 1a55b9fb3b0c..000000000000
--- a/include/asm-sparc64/ptrace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ptrace.h>
diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h
deleted file mode 100644
index 0d72eb811cc8..000000000000
--- a/include/asm-sparc64/reboot.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/reboot.h>
diff --git a/include/asm-sparc64/reg.h b/include/asm-sparc64/reg.h
deleted file mode 100644
index 495bab27da07..000000000000
--- a/include/asm-sparc64/reg.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/reg.h>
diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h
deleted file mode 100644
index 46e3bc0de476..000000000000
--- a/include/asm-sparc64/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/resource.h>
diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h
deleted file mode 100644
index e49a9685aead..000000000000
--- a/include/asm-sparc64/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rtc.h>
diff --git a/include/asm-sparc64/rwsem-const.h b/include/asm-sparc64/rwsem-const.h
deleted file mode 100644
index 2a1de315c86a..000000000000
--- a/include/asm-sparc64/rwsem-const.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rwsem-const.h>
diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h
deleted file mode 100644
index 6943c56ed087..000000000000
--- a/include/asm-sparc64/rwsem.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rwsem.h>
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
deleted file mode 100644
index 0cab0e89b874..000000000000
--- a/include/asm-sparc64/sbus.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sbus.h>
diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h
deleted file mode 100644
index b7fef95953ca..000000000000
--- a/include/asm-sparc64/scatterlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/scatterlist.h>
diff --git a/include/asm-sparc64/scratchpad.h b/include/asm-sparc64/scratchpad.h
deleted file mode 100644
index 23675f6a915a..000000000000
--- a/include/asm-sparc64/scratchpad.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/scratchpad.h>
diff --git a/include/asm-sparc64/seccomp.h b/include/asm-sparc64/seccomp.h
deleted file mode 100644
index f22f02a08a61..000000000000
--- a/include/asm-sparc64/seccomp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/seccomp.h>
diff --git a/include/asm-sparc64/sections.h b/include/asm-sparc64/sections.h
deleted file mode 100644
index 721496f8b2be..000000000000
--- a/include/asm-sparc64/sections.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sections.h>
diff --git a/include/asm-sparc64/sembuf.h b/include/asm-sparc64/sembuf.h
deleted file mode 100644
index c55b95214136..000000000000
--- a/include/asm-sparc64/sembuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sembuf.h>
diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h
deleted file mode 100644
index 7143d06b2c55..000000000000
--- a/include/asm-sparc64/setup.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/setup.h>
diff --git a/include/asm-sparc64/sfafsr.h b/include/asm-sparc64/sfafsr.h
deleted file mode 100644
index 8036fc377a4d..000000000000
--- a/include/asm-sparc64/sfafsr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sfafsr.h>
diff --git a/include/asm-sparc64/sfp-machine.h b/include/asm-sparc64/sfp-machine.h
deleted file mode 100644
index 7bbc4fecdc7d..000000000000
--- a/include/asm-sparc64/sfp-machine.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sfp-machine.h>
diff --git a/include/asm-sparc64/shmbuf.h b/include/asm-sparc64/shmbuf.h
deleted file mode 100644
index 0c54a2d68681..000000000000
--- a/include/asm-sparc64/shmbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/shmbuf.h>
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h
deleted file mode 100644
index 5fa3a9b05e7f..000000000000
--- a/include/asm-sparc64/shmparam.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/shmparam.h>
diff --git a/include/asm-sparc64/sigcontext.h b/include/asm-sparc64/sigcontext.h
deleted file mode 100644
index 5b16dcce44f2..000000000000
--- a/include/asm-sparc64/sigcontext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sigcontext.h>
diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h
deleted file mode 100644
index 8ffd6ebabc7a..000000000000
--- a/include/asm-sparc64/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/siginfo.h>
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h
deleted file mode 100644
index 79705e5d49c3..000000000000
--- a/include/asm-sparc64/signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/signal.h>
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
deleted file mode 100644
index 5095a2cbea52..000000000000
--- a/include/asm-sparc64/smp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/smp.h>
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h
deleted file mode 100644
index 13e0d5d94bb3..000000000000
--- a/include/asm-sparc64/socket.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/socket.h>
diff --git a/include/asm-sparc64/sockios.h b/include/asm-sparc64/sockios.h
deleted file mode 100644
index 2cb4b641482c..000000000000
--- a/include/asm-sparc64/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sockios.h>
diff --git a/include/asm-sparc64/sparsemem.h b/include/asm-sparc64/sparsemem.h
deleted file mode 100644
index e681f22a97ae..000000000000
--- a/include/asm-sparc64/sparsemem.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sparsemem.h>
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h
deleted file mode 100644
index 0115b8156eb8..000000000000
--- a/include/asm-sparc64/spinlock.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spinlock.h>
diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h
deleted file mode 100644
index 48d81c8734b5..000000000000
--- a/include/asm-sparc64/spinlock_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spinlock_types.h>
diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h
deleted file mode 100644
index 4430d2fbb0dc..000000000000
--- a/include/asm-sparc64/spitfire.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spitfire.h>
diff --git a/include/asm-sparc64/sstate.h b/include/asm-sparc64/sstate.h
deleted file mode 100644
index 97720ce2fd43..000000000000
--- a/include/asm-sparc64/sstate.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sstate.h>
diff --git a/include/asm-sparc64/stacktrace.h b/include/asm-sparc64/stacktrace.h
deleted file mode 100644
index adc9b92c0ef1..000000000000
--- a/include/asm-sparc64/stacktrace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/stacktrace.h>
diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h
deleted file mode 100644
index db97daa3bed4..000000000000
--- a/include/asm-sparc64/starfire.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/starfire.h>
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
deleted file mode 100644
index b108a866256b..000000000000
--- a/include/asm-sparc64/stat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/stat.h>
diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h
deleted file mode 100644
index 5503d6a4c67e..000000000000
--- a/include/asm-sparc64/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/statfs.h>
diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h
deleted file mode 100644
index 5018cd8b6ad0..000000000000
--- a/include/asm-sparc64/string.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/string.h>
diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h
deleted file mode 100644
index 9632be290eb5..000000000000
--- a/include/asm-sparc64/sunbpp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sunbpp.h>
diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h
deleted file mode 100644
index 3477b16e30ca..000000000000
--- a/include/asm-sparc64/syscalls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/syscalls.h>
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
deleted file mode 100644
index be2603c2e527..000000000000
--- a/include/asm-sparc64/system.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/system.h>
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h
deleted file mode 100644
index e03f97592c70..000000000000
--- a/include/asm-sparc64/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/termbits.h>
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
deleted file mode 100644
index 940495eb05cc..000000000000
--- a/include/asm-sparc64/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/termios.h>
diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h
deleted file mode 100644
index 92bed7913395..000000000000
--- a/include/asm-sparc64/thread_info.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/thread_info.h>
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h
deleted file mode 100644
index 88026d83cc93..000000000000
--- a/include/asm-sparc64/timer.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/timer.h>
diff --git a/include/asm-sparc64/timex.h b/include/asm-sparc64/timex.h
deleted file mode 100644
index 8dd59ee24b48..000000000000
--- a/include/asm-sparc64/timex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/timex.h>
diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h
deleted file mode 100644
index ae92fce10936..000000000000
--- a/include/asm-sparc64/tlb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tlb.h>
diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h
deleted file mode 100644
index a43979a06cd9..000000000000
--- a/include/asm-sparc64/tlbflush.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tlbflush.h>
diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h
deleted file mode 100644
index 46999b60fbba..000000000000
--- a/include/asm-sparc64/topology.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/topology.h>
diff --git a/include/asm-sparc64/tsb.h b/include/asm-sparc64/tsb.h
deleted file mode 100644
index 3677a302ea3e..000000000000
--- a/include/asm-sparc64/tsb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tsb.h>
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
deleted file mode 100644
index a550f1bf6f9b..000000000000
--- a/include/asm-sparc64/ttable.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ttable.h>
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h
deleted file mode 100644
index cfbfad5043eb..000000000000
--- a/include/asm-sparc64/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/types.h>
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h
deleted file mode 100644
index 2872d22844f3..000000000000
--- a/include/asm-sparc64/uaccess.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/uaccess.h>
diff --git a/include/asm-sparc64/uctx.h b/include/asm-sparc64/uctx.h
deleted file mode 100644
index 9e1b5794b07f..000000000000
--- a/include/asm-sparc64/uctx.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/uctx.h>
diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h
deleted file mode 100644
index 19fbf9508acf..000000000000
--- a/include/asm-sparc64/unaligned.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/unaligned.h>
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
deleted file mode 100644
index ad86e0b7a455..000000000000
--- a/include/asm-sparc64/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/unistd.h>
diff --git a/include/asm-sparc64/upa.h b/include/asm-sparc64/upa.h
deleted file mode 100644
index aab72930815a..000000000000
--- a/include/asm-sparc64/upa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/upa.h>
diff --git a/include/asm-sparc64/user.h b/include/asm-sparc64/user.h
deleted file mode 100644
index 29fc6e906c29..000000000000
--- a/include/asm-sparc64/user.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/user.h>
diff --git a/include/asm-sparc64/utrap.h b/include/asm-sparc64/utrap.h
deleted file mode 100644
index b030a41f1895..000000000000
--- a/include/asm-sparc64/utrap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/utrap.h>
diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h
deleted file mode 100644
index fbf4d58a56f0..000000000000
--- a/include/asm-sparc64/vga.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/vga.h>
diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h
deleted file mode 100644
index 299b26ab81a7..000000000000
--- a/include/asm-sparc64/vio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/vio.h>
diff --git a/include/asm-sparc64/visasm.h b/include/asm-sparc64/visasm.h
deleted file mode 100644
index 837a12278f4a..000000000000
--- a/include/asm-sparc64/visasm.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/visasm.h>
diff --git a/include/asm-sparc64/watchdog.h b/include/asm-sparc64/watchdog.h
deleted file mode 100644
index b0f2857145f7..000000000000
--- a/include/asm-sparc64/watchdog.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/watchdog.h>
diff --git a/include/asm-sparc64/xor.h b/include/asm-sparc64/xor.h
deleted file mode 100644
index ef187cc07ed5..000000000000
--- a/include/asm-sparc64/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/xor.h>
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 0eaa9bf6011f..ad9cd6d49bfc 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -249,25 +249,5 @@ static inline int dma_get_cache_alignment(void)
 
 #define dma_is_consistent(d, h) (1)
 
-#ifdef CONFIG_X86_32
-#  define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
-struct dma_coherent_mem {
-        void            *virt_base;
-        u32             device_base;
-        int             size;
-        int             flags;
-        unsigned long   *bitmap;
-};
-
-extern int
-dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-                            dma_addr_t device_addr, size_t size, int flags);
-
-extern void
-dma_release_declared_memory(struct device *dev);
-
-extern void *
-dma_mark_declared_memory_occupied(struct device *dev,
-                                  dma_addr_t device_addr, size_t size);
-#endif /* CONFIG_X86_32 */
+#include <asm-generic/dma-coherent.h>
 #endif
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
index fdde0bedaa90..bc34dc21f178 100644
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -556,6 +556,7 @@ int kvm_fix_hypercall(struct kvm_vcpu *vcpu);
 int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code);
 
 void kvm_enable_tdp(void);
+void kvm_disable_tdp(void);
 
 int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3);
 int complete_pio(struct kvm_vcpu *vcpu);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 82aa36c53ea7..50cfe8ceb478 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -205,6 +205,8 @@ void block_invalidatepage(struct page *page, unsigned long offset);
 int block_write_full_page(struct page *page, get_block_t *get_block,
                                 struct writeback_control *wbc);
 int block_read_full_page(struct page*, get_block_t*);
+int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
+                                unsigned long from);
 int block_write_begin(struct file *, struct address_space *,
                                 loff_t, unsigned, unsigned,
                                 struct page **, void **, get_block_t*);
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 1b5c98e7fef7..96d0509fb8d8 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -62,15 +62,7 @@
  * int next_cpu_nr(cpu, mask)           Next cpu past 'cpu', or nr_cpu_ids
  *
  * cpumask_t cpumask_of_cpu(cpu)        Return cpumask with bit 'cpu' set
- *ifdef CONFIG_HAS_CPUMASK_OF_CPU
- * cpumask_of_cpu_ptr_declare(v)        Declares cpumask_t *v
- * cpumask_of_cpu_ptr_next(v, cpu)      Sets v = &cpumask_of_cpu_map[cpu]
- * cpumask_of_cpu_ptr(v, cpu)           Combines above two operations
- *else
- * cpumask_of_cpu_ptr_declare(v)        Declares cpumask_t _v and *v = &_v
- * cpumask_of_cpu_ptr_next(v, cpu)      Sets _v = cpumask_of_cpu(cpu)
- * cpumask_of_cpu_ptr(v, cpu)           Combines above two operations
- *endif
+ *                                      (can be used as an lvalue)
  * CPU_MASK_ALL                         Initializer - all bits set
  * CPU_MASK_NONE                        Initializer - no bits set
  * unsigned long *cpus_addr(mask)       Array of unsigned long's in mask
@@ -273,37 +265,30 @@ static inline void __cpus_shift_left(cpumask_t *dstp,
         bitmap_shift_left(dstp->bits, srcp->bits, n, nbits);
 }
 
+/*
+ * Special-case data structure for "single bit set only" constant CPU masks.
+ *
+ * We pre-generate all the 64 (or 32) possible bit positions, with enough
+ * padding to the left and the right, and return the constant pointer
+ * appropriately offset.
+ */
+extern const unsigned long
+        cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)];
+
+static inline const cpumask_t *get_cpu_mask(unsigned int cpu)
+{
+        const unsigned long *p = cpu_bit_bitmap[1 + cpu % BITS_PER_LONG];
+        p -= cpu / BITS_PER_LONG;
+        return (const cpumask_t *)p;
+}
+
+/*
+ * In cases where we take the address of the cpumask immediately,
+ * gcc optimizes it out (it's a constant) and there's no huge stack
+ * variable created:
+ */
+#define cpumask_of_cpu(cpu) ({ *get_cpu_mask(cpu); })
 
-#ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP
-extern cpumask_t *cpumask_of_cpu_map;
-#define cpumask_of_cpu(cpu)     (cpumask_of_cpu_map[cpu])
-#define cpumask_of_cpu_ptr(v, cpu)                                      \
-                const cpumask_t *v = &cpumask_of_cpu(cpu)
-#define cpumask_of_cpu_ptr_declare(v)                                   \
-                const cpumask_t *v
-#define cpumask_of_cpu_ptr_next(v, cpu)                                 \
-                                        v = &cpumask_of_cpu(cpu)
-#else
-#define cpumask_of_cpu(cpu)                                             \
-({                                                                      \
-        typeof(_unused_cpumask_arg_) m;                                 \
-        if (sizeof(m) == sizeof(unsigned long)) {                       \
-                m.bits[0] = 1UL<<(cpu);                                 \
-        } else {                                                        \
-                cpus_clear(m);                                          \
-                cpu_set((cpu), m);                                      \
-        }                                                               \
-        m;                                                              \
-})
-#define cpumask_of_cpu_ptr(v, cpu)                                      \
-                cpumask_t _##v = cpumask_of_cpu(cpu);                   \
-                const cpumask_t *v = &_##v
-#define cpumask_of_cpu_ptr_declare(v)                                   \
-                cpumask_t _##v;                                         \
-                const cpumask_t *v = &_##v
-#define cpumask_of_cpu_ptr_next(v, cpu)                                 \
-                                        _##v = cpumask_of_cpu(cpu)
-#endif
 
 #define CPU_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(NR_CPUS)
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8252b045e624..580b513668fe 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -443,6 +443,27 @@ static inline size_t iov_iter_count(struct iov_iter *i)
         return i->count;
 }
 
+/*
+ * "descriptor" for what we're up to with a read.
+ * This allows us to use the same read code yet
+ * have multiple different users of the data that
+ * we read from a file.
+ *
+ * The simplest case just copies the data to user
+ * mode.
+ */
+typedef struct {
+        size_t written;
+        size_t count;
+        union {
+                char __user *buf;
+                void *data;
+        } arg;
+        int error;
+} read_descriptor_t;
+
+typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
+                unsigned long, unsigned long);
 
 struct address_space_operations {
         int (*writepage)(struct page *page, struct writeback_control *wbc);
@@ -484,6 +505,8 @@ struct address_space_operations {
         int (*migratepage) (struct address_space *,
                         struct page *, struct page *);
         int (*launder_page) (struct page *);
+        int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+                                        unsigned long);
 };
 
 /*
@@ -1198,27 +1221,6 @@ struct block_device_operations {
         struct module *owner;
 };
 
-/*
- * "descriptor" for what we're up to with a read.
- * This allows us to use the same read code yet
- * have multiple different users of the data that
- * we read from a file.
- *
- * The simplest case just copies the data to user
- * mode.
- */
-typedef struct {
-        size_t written;
-        size_t count;
-        union {
-                char __user * buf;
-                void *data;
-        } arg;
-        int error;
-} read_descriptor_t;
-
-typedef int (*read_actor_t)(read_descriptor_t *, struct page *, unsigned long, unsigned long);
-
 /* These macros are for out of kernel modules to test that
  * the kernel supports the unlocked_ioctl and compat_ioctl
  * fields in struct file_operations. */
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h
index c975caf75385..f8598f583944 100644
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
@@ -8,3 +8,4 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                       unsigned long align_mask);
 extern void iommu_area_free(unsigned long *map, unsigned long start,
                             unsigned int nr);
+extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
diff --git a/include/linux/maple.h b/include/linux/maple.h
index d31e36ebb436..523a286bb477 100644
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
@@ -61,8 +61,6 @@ struct maple_device {
 
 struct maple_driver {
         unsigned long function;
-        int (*connect) (struct maple_device * dev);
-        void (*disconnect) (struct maple_device * dev);
         struct device_driver drv;
 };
 
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index bb3dd0545928..49ef857cdb2d 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -1,5 +1,3 @@
-#ifndef MFD_CORE_H
-#define MFD_CORE_H
 /*
  * drivers/mfd/mfd-core.h
  *
@@ -13,6 +11,9 @@
  *
  */
 
+#ifndef MFD_CORE_H
+#define MFD_CORE_H
+
 #include <linux/platform_device.h>
 
 /*
@@ -28,7 +29,13 @@ struct mfd_cell {
         int                     (*suspend)(struct platform_device *dev);
         int                     (*resume)(struct platform_device *dev);
 
-        void                    *driver_data; /* driver-specific data */
+        /* driver-specific data for MFD-aware "cell" drivers */
+        void                    *driver_data;
+
+        /* platform_data can be used to either pass data to "generic"
+           driver or as a hook to mfd_cell for the "cell" drivers */
+        void                    *platform_data;
+        size_t                  data_size;
 
         /*
          * This resources can be specified relatievly to the parent device.
@@ -38,18 +45,11 @@ struct mfd_cell {
         const struct resource   *resources;
 };
 
-static inline struct mfd_cell *
-mfd_get_cell(struct platform_device *pdev)
-{
-        return (struct mfd_cell *)pdev->dev.platform_data;
-}
-
-extern int mfd_add_devices(
-                struct platform_device *parent,
-                const struct mfd_cell *cells, int n_devs,
-                struct resource *mem_base,
-                int irq_base);
+extern int mfd_add_devices(struct device *parent, int id,
+                           const struct mfd_cell *cells, int n_devs,
+                           struct resource *mem_base,
+                           int irq_base);
 
-extern void mfd_remove_devices(struct platform_device *parent);
+extern void mfd_remove_devices(struct device *parent);
 
 #endif
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6e695eaab4ce..866a3dbe5c75 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1104,6 +1104,9 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
         unsigned long addr, unsigned long len, pgoff_t pgoff);
 extern void exit_mmap(struct mm_struct *);
 
+extern int mm_take_all_locks(struct mm_struct *mm);
+extern void mm_drop_all_locks(struct mm_struct *mm);
+
 #ifdef CONFIG_PROC_FS
 /* From fs/proc/base.c. callers must _not_ hold the mm's exe_file_lock */
 extern void added_exe_file_vma(struct mm_struct *mm);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 746f975b58ef..386edbe2cb4e 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -10,6 +10,7 @@
 #include <linux/rbtree.h>
 #include <linux/rwsem.h>
 #include <linux/completion.h>
+#include <linux/cpumask.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 
@@ -253,6 +254,9 @@ struct mm_struct {
         struct file *exe_file;
         unsigned long num_exe_file_vmas;
 #endif
+#ifdef CONFIG_MMU_NOTIFIER
+        struct mmu_notifier_mm *mmu_notifier_mm;
+#endif
 };
 
 #endif /* _LINUX_MM_TYPES_H */
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
new file mode 100644
index 000000000000..b77486d152cd
--- /dev/null
+++ b/include/linux/mmu_notifier.h
@@ -0,0 +1,279 @@
+#ifndef _LINUX_MMU_NOTIFIER_H
+#define _LINUX_MMU_NOTIFIER_H
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/mm_types.h>
+
+struct mmu_notifier;
+struct mmu_notifier_ops;
+
+#ifdef CONFIG_MMU_NOTIFIER
+
+/*
+ * The mmu notifier_mm structure is allocated and installed in
+ * mm->mmu_notifier_mm inside the mm_take_all_locks() protected
+ * critical section and it's released only when mm_count reaches zero
+ * in mmdrop().
+ */
+struct mmu_notifier_mm {
+        /* all mmu notifiers registerd in this mm are queued in this list */
+        struct hlist_head list;
+        /* to serialize the list modifications and hlist_unhashed */
+        spinlock_t lock;
+};
+
+struct mmu_notifier_ops {
+        /*
+         * Called either by mmu_notifier_unregister or when the mm is
+         * being destroyed by exit_mmap, always before all pages are
+         * freed. This can run concurrently with other mmu notifier
+         * methods (the ones invoked outside the mm context) and it
+         * should tear down all secondary mmu mappings and freeze the
+         * secondary mmu. If this method isn't implemented you've to
+         * be sure that nothing could possibly write to the pages
+         * through the secondary mmu by the time the last thread with
+         * tsk->mm == mm exits.
+         *
+         * As side note: the pages freed after ->release returns could
+         * be immediately reallocated by the gart at an alias physical
+         * address with a different cache model, so if ->release isn't
+         * implemented because all _software_ driven memory accesses
+         * through the secondary mmu are terminated by the time the
+         * last thread of this mm quits, you've also to be sure that
+         * speculative _hardware_ operations can't allocate dirty
+         * cachelines in the cpu that could not be snooped and made
+         * coherent with the other read and write operations happening
+         * through the gart alias address, so leading to memory
+         * corruption.
+         */
+        void (*release)(struct mmu_notifier *mn,
+                        struct mm_struct *mm);
+
+        /*
+         * clear_flush_young is called after the VM is
+         * test-and-clearing the young/accessed bitflag in the
+         * pte. This way the VM will provide proper aging to the
+         * accesses to the page through the secondary MMUs and not
+         * only to the ones through the Linux pte.
+         */
+        int (*clear_flush_young)(struct mmu_notifier *mn,
+                                 struct mm_struct *mm,
+                                 unsigned long address);
+
+        /*
+         * Before this is invoked any secondary MMU is still ok to
+         * read/write to the page previously pointed to by the Linux
+         * pte because the page hasn't been freed yet and it won't be
+         * freed until this returns. If required set_page_dirty has to
+         * be called internally to this method.
+         */
+        void (*invalidate_page)(struct mmu_notifier *mn,
+                                struct mm_struct *mm,
+                                unsigned long address);
+
+        /*
+         * invalidate_range_start() and invalidate_range_end() must be
+         * paired and are called only when the mmap_sem and/or the
+         * locks protecting the reverse maps are held. The subsystem
+         * must guarantee that no additional references are taken to
+         * the pages in the range established between the call to
+         * invalidate_range_start() and the matching call to
+         * invalidate_range_end().
+         *
+         * Invalidation of multiple concurrent ranges may be
+         * optionally permitted by the driver. Either way the
+         * establishment of sptes is forbidden in the range passed to
+         * invalidate_range_begin/end for the whole duration of the
+         * invalidate_range_begin/end critical section.
+         *
+         * invalidate_range_start() is called when all pages in the
+         * range are still mapped and have at least a refcount of one.
+         *
+         * invalidate_range_end() is called when all pages in the
+         * range have been unmapped and the pages have been freed by
+         * the VM.
+         *
+         * The VM will remove the page table entries and potentially
+         * the page between invalidate_range_start() and
+         * invalidate_range_end(). If the page must not be freed
+         * because of pending I/O or other circumstances then the
+         * invalidate_range_start() callback (or the initial mapping
+         * by the driver) must make sure that the refcount is kept
+         * elevated.
+         *
+         * If the driver increases the refcount when the pages are
+         * initially mapped into an address space then either
+         * invalidate_range_start() or invalidate_range_end() may
+         * decrease the refcount. If the refcount is decreased on
+         * invalidate_range_start() then the VM can free pages as page
+         * table entries are removed.  If the refcount is only
+         * droppped on invalidate_range_end() then the driver itself
+         * will drop the last refcount but it must take care to flush
+         * any secondary tlb before doing the final free on the
+         * page. Pages will no longer be referenced by the linux
+         * address space but may still be referenced by sptes until
+         * the last refcount is dropped.
+         */
+        void (*invalidate_range_start)(struct mmu_notifier *mn,
+                                       struct mm_struct *mm,
+                                       unsigned long start, unsigned long end);
+        void (*invalidate_range_end)(struct mmu_notifier *mn,
+                                     struct mm_struct *mm,
+                                     unsigned long start, unsigned long end);
+};
+
+/*
+ * The notifier chains are protected by mmap_sem and/or the reverse map
+ * semaphores. Notifier chains are only changed when all reverse maps and
+ * the mmap_sem locks are taken.
+ *
+ * Therefore notifier chains can only be traversed when either
+ *
+ * 1. mmap_sem is held.
+ * 2. One of the reverse map locks is held (i_mmap_lock or anon_vma->lock).
+ * 3. No other concurrent thread can access the list (release)
+ */
+struct mmu_notifier {
+        struct hlist_node hlist;
+        const struct mmu_notifier_ops *ops;
+};
+
+static inline int mm_has_notifiers(struct mm_struct *mm)
+{
+        return unlikely(mm->mmu_notifier_mm);
+}
+
+extern int mmu_notifier_register(struct mmu_notifier *mn,
+                                 struct mm_struct *mm);
+extern int __mmu_notifier_register(struct mmu_notifier *mn,
+                                   struct mm_struct *mm);
+extern void mmu_notifier_unregister(struct mmu_notifier *mn,
+                                    struct mm_struct *mm);
+extern void __mmu_notifier_mm_destroy(struct mm_struct *mm);
+extern void __mmu_notifier_release(struct mm_struct *mm);
+extern int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
+                                          unsigned long address);
+extern void __mmu_notifier_invalidate_page(struct mm_struct *mm,
+                                          unsigned long address);
+extern void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end);
+extern void __mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end);
+
+static inline void mmu_notifier_release(struct mm_struct *mm)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_release(mm);
+}
+
+static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        if (mm_has_notifiers(mm))
+                return __mmu_notifier_clear_flush_young(mm, address);
+        return 0;
+}
+
+static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_invalidate_page(mm, address);
+}
+
+static inline void mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_invalidate_range_start(mm, start, end);
+}
+
+static inline void mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_invalidate_range_end(mm, start, end);
+}
+
+static inline void mmu_notifier_mm_init(struct mm_struct *mm)
+{
+        mm->mmu_notifier_mm = NULL;
+}
+
+static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_mm_destroy(mm);
+}
+
+/*
+ * These two macros will sometime replace ptep_clear_flush.
+ * ptep_clear_flush is impleemnted as macro itself, so this also is
+ * implemented as a macro until ptep_clear_flush will converted to an
+ * inline function, to diminish the risk of compilation failure. The
+ * invalidate_page method over time can be moved outside the PT lock
+ * and these two macros can be later removed.
+ */
+#define ptep_clear_flush_notify(__vma, __address, __ptep)               \
+({                                                                      \
+        pte_t __pte;                                                    \
+        struct vm_area_struct *___vma = __vma;                          \
+        unsigned long ___address = __address;                           \
+        __pte = ptep_clear_flush(___vma, ___address, __ptep);           \
+        mmu_notifier_invalidate_page(___vma->vm_mm, ___address);        \
+        __pte;                                                          \
+})
+
+#define ptep_clear_flush_young_notify(__vma, __address, __ptep)         \
+({                                                                      \
+        int __young;                                                    \
+        struct vm_area_struct *___vma = __vma;                          \
+        unsigned long ___address = __address;                           \
+        __young = ptep_clear_flush_young(___vma, ___address, __ptep);   \
+        __young |= mmu_notifier_clear_flush_young(___vma->vm_mm,        \
+                                                  ___address);          \
+        __young;                                                        \
+})
+
+#else /* CONFIG_MMU_NOTIFIER */
+
+static inline void mmu_notifier_release(struct mm_struct *mm)
+{
+}
+
+static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        return 0;
+}
+
+static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
+                                          unsigned long address)
+{
+}
+
+static inline void mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+}
+
+static inline void mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+}
+
+static inline void mmu_notifier_mm_init(struct mm_struct *mm)
+{
+}
+
+static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
+{
+}
+
+#define ptep_clear_flush_young_notify ptep_clear_flush_young
+#define ptep_clear_flush_notify ptep_clear_flush
+
+#endif /* CONFIG_MMU_NOTIFIER */
+
+#endif /* _LINUX_MMU_NOTIFIER_H */
diff --git a/include/linux/of.h b/include/linux/of.h
index 59a61bdc98b6..79886ade070f 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -70,5 +70,6 @@ extern int of_n_addr_cells(struct device_node *np);
 extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
         const struct of_device_id *matches, const struct device_node *node);
+extern int of_modalias_node(struct device_node *node, char *modalias, int len);
 
 #endif /* _LINUX_OF_H */
diff --git a/include/linux/of_spi.h b/include/linux/of_spi.h
new file mode 100644
index 000000000000..5f71ee8c0868
--- /dev/null
+++ b/include/linux/of_spi.h
@@ -0,0 +1,18 @@
+/*
+ * OpenFirmware SPI support routines
+ * Copyright (C) 2008 Secret Lab Technologies Ltd.
+ *
+ * Support routines for deriving SPI device attachments from the device
+ * tree.
+ */
+
+#ifndef __LINUX_OF_SPI_H
+#define __LINUX_OF_SPI_H
+
+#include <linux/of.h>
+#include <linux/spi/spi.h>
+
+extern void of_register_spi_devices(struct spi_master *master,
+                                    struct device_node *np);
+
+#endif /* __LINUX_OF_SPI */
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index a81d81890422..a39b38ccdc97 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -20,6 +20,7 @@
  */
 #define AS_EIO          (__GFP_BITS_SHIFT + 0)  /* IO error on async write */
 #define AS_ENOSPC       (__GFP_BITS_SHIFT + 1)  /* ENOSPC on async write */
+#define AS_MM_ALL_LOCKS (__GFP_BITS_SHIFT + 2)  /* under mm_take_all_locks() */
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index a1a1e618e996..91ba0b338b47 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -27,6 +27,7 @@ extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
 extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+extern void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
 {
@@ -40,6 +41,10 @@ static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }
+
+static inline void pcie_no_aspm(void)
+{
+}
 #endif
 
 #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1d296d31abe0..825be3878f68 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -124,6 +124,8 @@ enum pci_dev_flags {
          * generation too.
          */
         PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
+        /* Device configuration is irrevocably lost if disabled into D3 */
+        PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
 };
 
 typedef unsigned short __bitwise pci_bus_flags_t;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ffe479ba0779..35a78415accc 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -748,6 +748,7 @@
 #define PCI_VENDOR_ID_TI                0x104c
 #define PCI_DEVICE_ID_TI_TVP4020        0x3d07
 #define PCI_DEVICE_ID_TI_4450           0x8011
+#define PCI_DEVICE_ID_TI_TSB43AB22      0x8023
 #define PCI_DEVICE_ID_TI_XX21_XX11      0x8031
 #define PCI_DEVICE_ID_TI_XX21_XX11_FM   0x8033
 #define PCI_DEVICE_ID_TI_XX21_XX11_SD   0x8034
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 19958b929905..450684f7eaac 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -374,6 +374,7 @@
 #define  PCI_EXP_DEVCAP_ATN_BUT 0x1000  /* Attention Button Present */
 #define  PCI_EXP_DEVCAP_ATN_IND 0x2000  /* Attention Indicator Present */
 #define  PCI_EXP_DEVCAP_PWR_IND 0x4000  /* Power Indicator Present */
+#define  PCI_EXP_DEVCAP_RBER    0x8000  /* Role-Based Error Reporting */
 #define  PCI_EXP_DEVCAP_PWR_VAL 0x3fc0000 /* Slot Power Limit Value */
 #define  PCI_EXP_DEVCAP_PWR_SCL 0xc000000 /* Slot Power Limit Scale */
 #define PCI_EXP_DEVCTL          8       /* Device Control */
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index b0f39be08b6c..eb4443c7e05b 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -98,6 +98,34 @@ static inline void list_del_rcu(struct list_head *entry)
 }
 
 /**
+ * hlist_del_init_rcu - deletes entry from hash list with re-initialization
+ * @n: the element to delete from the hash list.
+ *
+ * Note: list_unhashed() on the node return true after this. It is
+ * useful for RCU based read lockfree traversal if the writer side
+ * must know if the list entry is still hashed or already unhashed.
+ *
+ * In particular, it means that we can not poison the forward pointers
+ * that may still be used for walking the hash list and we can only
+ * zero the pprev pointer so list_unhashed() will return true after
+ * this.
+ *
+ * The caller must take whatever precautions are necessary (such as
+ * holding appropriate locks) to avoid racing with another
+ * list-mutation primitive, such as hlist_add_head_rcu() or
+ * hlist_del_rcu(), running on this same list.  However, it is
+ * perfectly legal to run concurrently with the _rcu list-traversal
+ * primitives, such as hlist_for_each_entry_rcu().
+ */
+static inline void hlist_del_init_rcu(struct hlist_node *n)
+{
+        if (!hlist_unhashed(n)) {
+                __hlist_del(n);
+                n->pprev = NULL;
+        }
+}
+
+/**
  * list_replace_rcu - replace old entry by new one
  * @old : the element to be replaced
  * @new : the new element to insert
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 1383692ac5bd..69407f85e10b 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -26,6 +26,14 @@
  */
 struct anon_vma {
         spinlock_t lock;        /* Serialize access to vma list */
+        /*
+         * NOTE: the LSB of the head.next is set by
+         * mm_take_all_locks() _after_ taking the above lock. So the
+         * head must only be read/written after taking the above lock
+         * to be sure to see a valid next pointer. The LSB bit itself
+         * is serialized by a system wide lock only visible to
+         * mm_take_all_locks() (mm_all_locks_mutex).
+         */
         struct list_head head;  /* List of private "related" vmas */
 };
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index f59318a0099b..5270d449ff9d 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -505,9 +505,6 @@ struct signal_struct {
         unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
         unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
         unsigned long inblock, oublock, cinblock, coublock;
-#ifdef CONFIG_TASK_XACCT
-        u64 rchar, wchar, syscr, syscw;
-#endif
         struct task_io_accounting ioac;
 
         /*
@@ -1256,10 +1253,6 @@ struct task_struct {
 
         unsigned long ptrace_message;
         siginfo_t *last_siginfo; /* For ptrace use.  */
-#ifdef CONFIG_TASK_XACCT
-/* i/o counters(bytes read/written, #syscalls */
-        u64 rchar, wchar, syscr, syscw;
-#endif
         struct task_io_accounting ioac;
 #if defined(CONFIG_TASK_XACCT)
         u64 acct_rss_mem1;      /* accumulated rss usage */
@@ -2190,22 +2183,22 @@ extern long sched_group_rt_period(struct task_group *tg);
 #ifdef CONFIG_TASK_XACCT
 static inline void add_rchar(struct task_struct *tsk, ssize_t amt)
 {
-        tsk->rchar += amt;
+        tsk->ioac.rchar += amt;
 }
 
 static inline void add_wchar(struct task_struct *tsk, ssize_t amt)
 {
-        tsk->wchar += amt;
+        tsk->ioac.wchar += amt;
 }
 
 static inline void inc_syscr(struct task_struct *tsk)
 {
-        tsk->syscr++;
+        tsk->ioac.syscr++;
 }
 
 static inline void inc_syscw(struct task_struct *tsk)
 {
-        tsk->syscw++;
+        tsk->ioac.syscw++;
 }
 #else
 static inline void add_rchar(struct task_struct *tsk, ssize_t amt)
diff --git a/include/linux/serio.h b/include/linux/serio.h
index e72716cca577..25641d9e0ea8 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -87,11 +87,10 @@ void serio_unregister_port(struct serio *serio);
 void serio_unregister_child_port(struct serio *serio);
 
 int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name);
-static inline int serio_register_driver(struct serio_driver *drv)
+static inline int __must_check serio_register_driver(struct serio_driver *drv)
 {
         return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME);
 }
-int serio_register_driver(struct serio_driver *drv);
 void serio_unregister_driver(struct serio_driver *drv);
 
 static inline int serio_write(struct serio *serio, unsigned char data)
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index a9cc29d46653..4be01bb44377 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -778,8 +778,20 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
  * use spi_new_device() to describe each device.  You can also call
  * spi_unregister_device() to start making that device vanish, but
  * normally that would be handled by spi_unregister_master().
+ *
+ * You can also use spi_alloc_device() and spi_add_device() to use a two
+ * stage registration sequence for each spi_device.  This gives the caller
+ * some more control over the spi_device structure before it is registered,
+ * but requires that caller to initialize fields that would otherwise
+ * be defined using the board info.
  */
 extern struct spi_device *
+spi_alloc_device(struct spi_master *master);
+
+extern int
+spi_add_device(struct spi_device *spi);
+
+extern struct spi_device *
 spi_new_device(struct spi_master *, struct spi_board_info *);
 
 static inline void
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index 5bfc553bdb21..f1cb0ba6d715 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -5,41 +5,43 @@
    (and more).  So the "read" side to such a lock is anything which
    diables preeempt. */
 #include <linux/cpu.h>
+#include <linux/cpumask.h>
 #include <asm/system.h>
 
 #if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)
+
+/* Deprecated, but useful for transition. */
+#define ALL_CPUS ~0U
+
 /**
- * stop_machine_run: freeze the machine on all CPUs and run this function
+ * stop_machine: freeze the machine on all CPUs and run this function
  * @fn: the function to run
  * @data: the data ptr for the @fn()
- * @cpu: the cpu to run @fn() on (or any, if @cpu == NR_CPUS.
+ * @cpus: the cpus to run the @fn() on (NULL = any online cpu)
  *
- * Description: This causes a thread to be scheduled on every other cpu,
- * each of which disables interrupts, and finally interrupts are disabled
- * on the current CPU.  The result is that noone is holding a spinlock
- * or inside any other preempt-disabled region when @fn() runs.
+ * Description: This causes a thread to be scheduled on every cpu,
+ * each of which disables interrupts.  The result is that noone is
+ * holding a spinlock or inside any other preempt-disabled region when
+ * @fn() runs.
  *
  * This can be thought of as a very heavy write lock, equivalent to
  * grabbing every spinlock in the kernel. */
-int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu);
+int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus);
 
 /**
- * __stop_machine_run: freeze the machine on all CPUs and run this function
+ * __stop_machine: freeze the machine on all CPUs and run this function
  * @fn: the function to run
  * @data: the data ptr for the @fn
- * @cpu: the cpu to run @fn on (or any, if @cpu == NR_CPUS.
+ * @cpus: the cpus to run the @fn() on (NULL = any online cpu)
  *
- * Description: This is a special version of the above, which returns the
- * thread which has run @fn(): kthread_stop will return the return value
- * of @fn().  Used by hotplug cpu.
+ * Description: This is a special version of the above, which assumes cpus
+ * won't come or go while it's being called.  Used by hotplug cpu.
  */
-struct task_struct *__stop_machine_run(int (*fn)(void *), void *data,
-                                       unsigned int cpu);
-
+int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus);
 #else
 
-static inline int stop_machine_run(int (*fn)(void *), void *data,
-                                   unsigned int cpu)
+static inline int stop_machine(int (*fn)(void *), void *data,
+                               const cpumask_t *cpus)
 {
         int ret;
         local_irq_disable();
@@ -48,4 +50,18 @@ static inline int stop_machine_run(int (*fn)(void *), void *data,
         return ret;
 }
 #endif /* CONFIG_SMP */
+
+static inline int __deprecated stop_machine_run(int (*fn)(void *), void *data,
+                                                unsigned int cpu)
+{
+        /* If they don't care which cpu fn runs on, just pick one. */
+        if (cpu == NR_CPUS)
+                return stop_machine(fn, data, NULL);
+        else if (cpu == ~0U)
+                return stop_machine(fn, data, &cpu_possible_map);
+        else {
+                cpumask_t cpus = cpumask_of_cpu(cpu);
+                return stop_machine(fn, data, &cpus);
+        }
+}
 #endif /* _LINUX_STOP_MACHINE */
diff --git a/include/linux/task_io_accounting.h b/include/linux/task_io_accounting.h
index 44d00e9cceea..5e88afc9a2fb 100644
--- a/include/linux/task_io_accounting.h
+++ b/include/linux/task_io_accounting.h
@@ -8,8 +8,19 @@
  * Blame akpm@osdl.org for all this.
  */
 
-#ifdef CONFIG_TASK_IO_ACCOUNTING
 struct task_io_accounting {
+#ifdef CONFIG_TASK_XACCT
+        /* bytes read */
+        u64 rchar;
+        /*  bytes written */
+        u64 wchar;
+        /* # of read syscalls */
+        u64 syscr;
+        /* # of write syscalls */
+        u64 syscw;
+#endif /* CONFIG_TASK_XACCT */
+
+#ifdef CONFIG_TASK_IO_ACCOUNTING
         /*
          * The number of bytes which this task has caused to be read from
          * storage.
@@ -30,8 +41,5 @@ struct task_io_accounting {
          * information loss in doing that.
          */
         u64 cancelled_write_bytes;
+#endif /* CONFIG_TASK_IO_ACCOUNTING */
 };
-#else
-struct task_io_accounting {
-};
-#endif
diff --git a/include/linux/task_io_accounting_ops.h b/include/linux/task_io_accounting_ops.h
index ff46c6fad79d..4d090f9ee608 100644
--- a/include/linux/task_io_accounting_ops.h
+++ b/include/linux/task_io_accounting_ops.h
@@ -40,9 +40,17 @@ static inline void task_io_account_cancelled_write(size_t bytes)
         current->ioac.cancelled_write_bytes += bytes;
 }
 
-static inline void task_io_accounting_init(struct task_struct *tsk)
+static inline void task_io_accounting_init(struct task_io_accounting *ioac)
 {
-        memset(&tsk->ioac, 0, sizeof(tsk->ioac));
+        memset(ioac, 0, sizeof(*ioac));
+}
+
+static inline void task_blk_io_accounting_add(struct task_io_accounting *dst,
+                                                struct task_io_accounting *src)
+{
+        dst->read_bytes += src->read_bytes;
+        dst->write_bytes += src->write_bytes;
+        dst->cancelled_write_bytes += src->cancelled_write_bytes;
 }
 
 #else
@@ -69,9 +77,37 @@ static inline void task_io_account_cancelled_write(size_t bytes)
 {
 }
 
-static inline void task_io_accounting_init(struct task_struct *tsk)
+static inline void task_io_accounting_init(struct task_io_accounting *ioac)
+{
+}
+
+static inline void task_blk_io_accounting_add(struct task_io_accounting *dst,
+                                                struct task_io_accounting *src)
 {
 }
 
-#endif          /* CONFIG_TASK_IO_ACCOUNTING */
-#endif          /* __TASK_IO_ACCOUNTING_OPS_INCLUDED */
+#endif /* CONFIG_TASK_IO_ACCOUNTING */
+
+#ifdef CONFIG_TASK_XACCT
+static inline void task_chr_io_accounting_add(struct task_io_accounting *dst,
+                                                struct task_io_accounting *src)
+{
+        dst->rchar += src->rchar;
+        dst->wchar += src->wchar;
+        dst->syscr += src->syscr;
+        dst->syscw += src->syscw;
+}
+#else
+static inline void task_chr_io_accounting_add(struct task_io_accounting *dst,
+                                                struct task_io_accounting *src)
+{
+}
+#endif /* CONFIG_TASK_XACCT */
+
+static inline void task_io_accounting_add(struct task_io_accounting *dst,
+                                                struct task_io_accounting *src)
+{
+        task_chr_io_accounting_add(dst, src);
+        task_blk_io_accounting_add(dst, src);
+}
+#endif /* __TASK_IO_ACCOUNTING_OPS_INCLUDED */
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 9385a566aed8..15a653d41132 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -17,6 +17,21 @@
 
 #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
 
+#define VID_TYPE_CAPTURE        1       /* Can capture */
+#define VID_TYPE_TUNER          2       /* Can tune */
+#define VID_TYPE_TELETEXT       4       /* Does teletext */
+#define VID_TYPE_OVERLAY        8       /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY      16      /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING       32      /* Can clip */
+#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES         128     /* Scalable */
+#define VID_TYPE_MONOCHROME     256     /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER   1024    /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
+
 struct video_capability
 {
         char name[32];
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 2e66a95e8d32..e466bd54a50e 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -71,6 +71,11 @@
  */
 #define VIDEO_MAX_FRAME               32
 
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
 #define VID_TYPE_CAPTURE        1       /* Can capture */
 #define VID_TYPE_TUNER          2       /* Can tune */
 #define VID_TYPE_TELETEXT       4       /* Does teletext */
@@ -85,14 +90,15 @@
 #define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
 #define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
 #define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
+#endif
 
 /*
  *      M I S C E L L A N E O U S
  */
 
 /*  Four-character-code (FOURCC) */
-#define v4l2_fourcc(a,b,c,d)\
-        (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
+#define v4l2_fourcc(a, b, c, d)\
+        ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
 
 /*
  *      E N U M S
@@ -226,8 +232,7 @@ struct v4l2_fract {
 /*
  *      D R I V E R   C A P A B I L I T I E S
  */
-struct v4l2_capability
-{
+struct v4l2_capability {
         __u8    driver[16];     /* i.e. "bttv" */
         __u8    card[32];       /* i.e. "Hauppauge WinTV" */
         __u8    bus_info[32];   /* "PCI:" + pci_name(pci_dev) */
@@ -259,8 +264,7 @@ struct v4l2_capability
 /*
  *      V I D E O   I M A G E   F O R M A T
  */
-struct v4l2_pix_format
-{
+struct v4l2_pix_format {
         __u32                   width;
         __u32                   height;
         __u32                   pixelformat;
@@ -272,68 +276,69 @@ struct v4l2_pix_format
 };
 
 /*      Pixel format         FOURCC                        depth  Description  */
-#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R','G','B','1') /*  8  RGB-3-3-2     */
-#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R','4','4','4') /* 16  xxxxrrrr ggggbbbb */
-#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R','G','B','O') /* 16  RGB-5-5-5     */
-#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R','G','B','P') /* 16  RGB-5-6-5     */
-#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') /* 16  RGB-5-5-5 BE  */
-#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R') /* 16  RGB-5-6-5 BE  */
-#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B','G','R','3') /* 24  BGR-8-8-8     */
-#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R','G','B','3') /* 24  RGB-8-8-8     */
-#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4') /* 32  BGR-8-8-8-8   */
-#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4') /* 32  RGB-8-8-8-8   */
-#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y') /*  8  Greyscale     */
-#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y','1','6',' ') /* 16  Greyscale     */
-#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P','A','L','8') /*  8  8-bit palette */
-#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9') /*  9  YVU 4:1:0     */
-#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2') /* 12  YVU 4:2:0     */
-#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y','U','Y','V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U','Y','V','Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') /* 16  YVU422 planar */
-#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') /* 16  YVU411 planar */
-#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y','4','1','P') /* 12  YUV 4:1:1     */
-#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y','4','4','4') /* 16  xxxxyyyy uuuuvvvv */
-#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y','U','V','O') /* 16  YUV-5-5-5     */
-#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y','U','V','P') /* 16  YUV-5-6-5     */
-#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y','U','V','4') /* 32  YUV-8-8-8-8   */
+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
 
 /* two planes -- one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N','V','1','2') /* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N','V','2','1') /* 12  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
 
 /*  The following formats are not defined in the V4L2 specification */
-#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y','U','V','9') /*  9  YUV 4:1:0     */
-#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y','U','1','2') /* 12  YUV 4:2:0     */
-#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y','Y','U','V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H','I','2','4') /*  8  8-bit color   */
-#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H','M','1','2') /*  8  YUV 4:2:0 16x16 macroblocks */
+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
 
 /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /*  8  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G','B','R','G') /*  8  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
 
 /* compressed formats */
-#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M','J','P','G') /* Motion-JPEG   */
-#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J','P','E','G') /* JFIF JPEG     */
-#define V4L2_PIX_FMT_DV       v4l2_fourcc('d','v','s','d') /* 1394          */
-#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M','P','E','G') /* MPEG-1/2/4    */
+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
 
 /*  Vendor-specific formats   */
-#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W','N','V','A') /* Winnov hw compress */
-#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S','9','1','0') /* SN9C10x compression */
-#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P','W','C','1') /* pwc older webcam */
-#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P','W','C','2') /* pwc newer webcam */
-#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */
-#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S','5','0','1') /* YUYV per line */
-#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S','5','6','1') /* compressed GBRG bayer */
-#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P','2','0','7') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
 
 /*
  *      F O R M A T   E N U M E R A T I O N
  */
-struct v4l2_fmtdesc
-{
+struct v4l2_fmtdesc {
         __u32               index;             /* Format number      */
         enum v4l2_buf_type  type;              /* buffer type        */
         __u32               flags;
@@ -349,21 +354,18 @@ struct v4l2_fmtdesc
 /*
  *      F R A M E   S I Z E   E N U M E R A T I O N
  */
-enum v4l2_frmsizetypes
-{
+enum v4l2_frmsizetypes {
         V4L2_FRMSIZE_TYPE_DISCRETE      = 1,
         V4L2_FRMSIZE_TYPE_CONTINUOUS    = 2,
         V4L2_FRMSIZE_TYPE_STEPWISE      = 3,
 };
 
-struct v4l2_frmsize_discrete
-{
+struct v4l2_frmsize_discrete {
         __u32                   width;          /* Frame width [pixel] */
         __u32                   height;         /* Frame height [pixel] */
 };
 
-struct v4l2_frmsize_stepwise
-{
+struct v4l2_frmsize_stepwise {
         __u32                   min_width;      /* Minimum frame width [pixel] */
         __u32                   max_width;      /* Maximum frame width [pixel] */
         __u32                   step_width;     /* Frame width step size [pixel] */
@@ -372,8 +374,7 @@ struct v4l2_frmsize_stepwise
         __u32                   step_height;    /* Frame height step size [pixel] */
 };
 
-struct v4l2_frmsizeenum
-{
+struct v4l2_frmsizeenum {
         __u32                   index;          /* Frame size number */
         __u32                   pixel_format;   /* Pixel format */
         __u32                   type;           /* Frame size type the device supports. */
@@ -389,22 +390,19 @@ struct v4l2_frmsizeenum
 /*
  *      F R A M E   R A T E   E N U M E R A T I O N
  */
-enum v4l2_frmivaltypes
-{
+enum v4l2_frmivaltypes {
         V4L2_FRMIVAL_TYPE_DISCRETE      = 1,
         V4L2_FRMIVAL_TYPE_CONTINUOUS    = 2,
         V4L2_FRMIVAL_TYPE_STEPWISE      = 3,
 };
 
-struct v4l2_frmival_stepwise
-{
+struct v4l2_frmival_stepwise {
         struct v4l2_fract       min;            /* Minimum frame interval [s] */
         struct v4l2_fract       max;            /* Maximum frame interval [s] */
         struct v4l2_fract       step;           /* Frame interval step size [s] */
 };
 
-struct v4l2_frmivalenum
-{
+struct v4l2_frmivalenum {
         __u32                   index;          /* Frame format index */
         __u32                   pixel_format;   /* Pixel format */
         __u32                   width;          /* Frame width */
@@ -423,8 +421,7 @@ struct v4l2_frmivalenum
 /*
  *      T I M E C O D E
  */
-struct v4l2_timecode
-{
+struct v4l2_timecode {
         __u32   type;
         __u32   flags;
         __u8    frames;
@@ -449,8 +446,7 @@ struct v4l2_timecode
 #define V4L2_TC_USERBITS_8BITCHARS      0x0008
 /* The above is based on SMPTE timecodes */
 
-struct v4l2_jpegcompression
-{
+struct v4l2_jpegcompression {
         int quality;
 
         int  APPn;              /* Number of APP segment to be written,
@@ -482,16 +478,14 @@ struct v4l2_jpegcompression
 /*
  *      M E M O R Y - M A P P I N G   B U F F E R S
  */
-struct v4l2_requestbuffers
-{
+struct v4l2_requestbuffers {
         __u32                   count;
         enum v4l2_buf_type      type;
         enum v4l2_memory        memory;
         __u32                   reserved[2];
 };
 
-struct v4l2_buffer
-{
+struct v4l2_buffer {
         __u32                   index;
         enum v4l2_buf_type      type;
         __u32                   bytesused;
@@ -525,13 +519,12 @@ struct v4l2_buffer
 /*
  *      O V E R L A Y   P R E V I E W
  */
-struct v4l2_framebuffer
-{
+struct v4l2_framebuffer {
         __u32                   capability;
         __u32                   flags;
 /* FIXME: in theory we should pass something like PCI device + memory
  * region + offset instead of some physical address */
-        void*                   base;
+        void                    *base;
         struct v4l2_pix_format  fmt;
 };
 /*  Flags for the 'capability' field. Read only */
@@ -550,14 +543,12 @@ struct v4l2_framebuffer
 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
 
-struct v4l2_clip
-{
+struct v4l2_clip {
         struct v4l2_rect        c;
         struct v4l2_clip        __user *next;
 };
 
-struct v4l2_window
-{
+struct v4l2_window {
         struct v4l2_rect        w;
         enum v4l2_field         field;
         __u32                   chromakey;
@@ -570,8 +561,7 @@ struct v4l2_window
 /*
  *      C A P T U R E   P A R A M E T E R S
  */
-struct v4l2_captureparm
-{
+struct v4l2_captureparm {
         __u32              capability;    /*  Supported modes */
         __u32              capturemode;   /*  Current mode */
         struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
@@ -584,8 +574,7 @@ struct v4l2_captureparm
 #define V4L2_MODE_HIGHQUALITY   0x0001  /*  High quality imaging mode */
 #define V4L2_CAP_TIMEPERFRAME   0x1000  /*  timeperframe field is supported */
 
-struct v4l2_outputparm
-{
+struct v4l2_outputparm {
         __u32              capability;   /*  Supported modes */
         __u32              outputmode;   /*  Current mode */
         struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
@@ -702,8 +691,7 @@ typedef __u64 v4l2_std_id;
 #define V4L2_STD_ALL            (V4L2_STD_525_60        |\
                                  V4L2_STD_625_50)
 
-struct v4l2_standard
-{
+struct v4l2_standard {
         __u32                index;
         v4l2_std_id          id;
         __u8                 name[24];
@@ -715,8 +703,7 @@ struct v4l2_standard
 /*
  *      V I D E O   I N P U T S
  */
-struct v4l2_input
-{
+struct v4l2_input {
         __u32        index;             /*  Which input */
         __u8         name[32];          /*  Label */
         __u32        type;              /*  Type of input */
@@ -753,8 +740,7 @@ struct v4l2_input
 /*
  *      V I D E O   O U T P U T S
  */
-struct v4l2_output
-{
+struct v4l2_output {
         __u32        index;             /*  Which output */
         __u8         name[32];          /*  Label */
         __u32        type;              /*  Type of output */
@@ -771,14 +757,12 @@ struct v4l2_output
 /*
  *      C O N T R O L S
  */
-struct v4l2_control
-{
+struct v4l2_control {
         __u32                id;
         __s32                value;
 };
 
-struct v4l2_ext_control
-{
+struct v4l2_ext_control {
         __u32 id;
         __u32 reserved2[2];
         union {
@@ -788,8 +772,7 @@ struct v4l2_ext_control
         };
 } __attribute__ ((packed));
 
-struct v4l2_ext_controls
-{
+struct v4l2_ext_controls {
         __u32 ctrl_class;
         __u32 count;
         __u32 error_idx;
@@ -807,8 +790,7 @@ struct v4l2_ext_controls
 #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-struct v4l2_queryctrl
-{
+struct v4l2_queryctrl {
         __u32                id;
         enum v4l2_ctrl_type  type;
         __u8                 name[32];  /* Whatever */
@@ -821,8 +803,7 @@ struct v4l2_queryctrl
 };
 
 /*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-struct v4l2_querymenu
-{
+struct v4l2_querymenu {
         __u32           id;
         __u32           index;
         __u8            name[32];       /* Whatever */
@@ -1104,8 +1085,7 @@ enum  v4l2_exposure_auto_type {
 /*
  *      T U N I N G
  */
-struct v4l2_tuner
-{
+struct v4l2_tuner {
         __u32                   index;
         __u8                    name[32];
         enum v4l2_tuner_type    type;
@@ -1119,8 +1099,7 @@ struct v4l2_tuner
         __u32                   reserved[4];
 };
 
-struct v4l2_modulator
-{
+struct v4l2_modulator {
         __u32                   index;
         __u8                    name[32];
         __u32                   capability;
@@ -1153,8 +1132,7 @@ struct v4l2_modulator
 #define V4L2_TUNER_MODE_LANG1           0x0003
 #define V4L2_TUNER_MODE_LANG1_LANG2     0x0004
 
-struct v4l2_frequency
-{
+struct v4l2_frequency {
         __u32                 tuner;
         enum v4l2_tuner_type  type;
         __u32                 frequency;
@@ -1172,8 +1150,7 @@ struct v4l2_hw_freq_seek {
 /*
  *      A U D I O
  */
-struct v4l2_audio
-{
+struct v4l2_audio {
         __u32   index;
         __u8    name[32];
         __u32   capability;
@@ -1188,8 +1165,7 @@ struct v4l2_audio
 /*  Flags for the 'mode' field */
 #define V4L2_AUDMODE_AVL                0x00001
 
-struct v4l2_audioout
-{
+struct v4l2_audioout {
         __u32   index;
         __u8    name[32];
         __u32   capability;
@@ -1253,8 +1229,7 @@ struct v4l2_encoder_cmd {
  */
 
 /* Raw VBI */
-struct v4l2_vbi_format
-{
+struct v4l2_vbi_format {
         __u32   sampling_rate;          /* in 1 Hz */
         __u32   offset;
         __u32   samples_per_line;
@@ -1266,8 +1241,8 @@ struct v4l2_vbi_format
 };
 
 /*  VBI flags  */
-#define V4L2_VBI_UNSYNC         (1<< 0)
-#define V4L2_VBI_INTERLACED     (1<< 1)
+#define V4L2_VBI_UNSYNC         (1 << 0)
+#define V4L2_VBI_INTERLACED     (1 << 1)
 
 /* Sliced VBI
  *
@@ -1276,8 +1251,7 @@ struct v4l2_vbi_format
  * notice in the definitive implementation.
  */
 
-struct v4l2_sliced_vbi_format
-{
+struct v4l2_sliced_vbi_format {
         __u16   service_set;
         /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
            service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
@@ -1301,8 +1275,7 @@ struct v4l2_sliced_vbi_format
 #define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
 #define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
 
-struct v4l2_sliced_vbi_cap
-{
+struct v4l2_sliced_vbi_cap {
         __u16   service_set;
         /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
            service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
@@ -1313,8 +1286,7 @@ struct v4l2_sliced_vbi_cap
         __u32   reserved[3];    /* must be 0 */
 };
 
-struct v4l2_sliced_vbi_data
-{
+struct v4l2_sliced_vbi_data {
         __u32   id;
         __u32   field;          /* 0: first field, 1: second field */
         __u32   line;           /* 1-23 */
@@ -1328,27 +1300,23 @@ struct v4l2_sliced_vbi_data
 
 /*      Stream data format
  */
-struct v4l2_format
-{
+struct v4l2_format {
         enum v4l2_buf_type type;
-        union
-        {
-                struct v4l2_pix_format          pix;     // V4L2_BUF_TYPE_VIDEO_CAPTURE
-                struct v4l2_window              win;     // V4L2_BUF_TYPE_VIDEO_OVERLAY
-                struct v4l2_vbi_format          vbi;     // V4L2_BUF_TYPE_VBI_CAPTURE
-                struct v4l2_sliced_vbi_format   sliced;  // V4L2_BUF_TYPE_SLICED_VBI_CAPTURE
-                __u8    raw_data[200];                   // user-defined
+        union {
+                struct v4l2_pix_format          pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
+                struct v4l2_window              win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
+                struct v4l2_vbi_format          vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
+                struct v4l2_sliced_vbi_format   sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
+                __u8    raw_data[200];                   /* user-defined */
         } fmt;
 };
 
 
 /*      Stream type-dependent parameters
  */
-struct v4l2_streamparm
-{
+struct v4l2_streamparm {
         enum v4l2_buf_type type;
-        union
-        {
+        union {
                 struct v4l2_captureparm capture;
                 struct v4l2_outputparm  output;
                 __u8    raw_data[200];  /* user-defined */
@@ -1386,92 +1354,86 @@ struct v4l2_chip_ident {
  *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
  *
  */
-#define VIDIOC_QUERYCAP         _IOR  ('V',  0, struct v4l2_capability)
-#define VIDIOC_RESERVED         _IO   ('V',  1)
-#define VIDIOC_ENUM_FMT         _IOWR ('V',  2, struct v4l2_fmtdesc)
-#define VIDIOC_G_FMT            _IOWR ('V',  4, struct v4l2_format)
-#define VIDIOC_S_FMT            _IOWR ('V',  5, struct v4l2_format)
-#define VIDIOC_REQBUFS          _IOWR ('V',  8, struct v4l2_requestbuffers)
-#define VIDIOC_QUERYBUF         _IOWR ('V',  9, struct v4l2_buffer)
-#define VIDIOC_G_FBUF           _IOR  ('V', 10, struct v4l2_framebuffer)
-#define VIDIOC_S_FBUF           _IOW  ('V', 11, struct v4l2_framebuffer)
-#define VIDIOC_OVERLAY          _IOW  ('V', 14, int)
-#define VIDIOC_QBUF             _IOWR ('V', 15, struct v4l2_buffer)
-#define VIDIOC_DQBUF            _IOWR ('V', 17, struct v4l2_buffer)
-#define VIDIOC_STREAMON         _IOW  ('V', 18, int)
-#define VIDIOC_STREAMOFF        _IOW  ('V', 19, int)
-#define VIDIOC_G_PARM           _IOWR ('V', 21, struct v4l2_streamparm)
-#define VIDIOC_S_PARM           _IOWR ('V', 22, struct v4l2_streamparm)
-#define VIDIOC_G_STD            _IOR  ('V', 23, v4l2_std_id)
-#define VIDIOC_S_STD            _IOW  ('V', 24, v4l2_std_id)
-#define VIDIOC_ENUMSTD          _IOWR ('V', 25, struct v4l2_standard)
-#define VIDIOC_ENUMINPUT        _IOWR ('V', 26, struct v4l2_input)
-#define VIDIOC_G_CTRL           _IOWR ('V', 27, struct v4l2_control)
-#define VIDIOC_S_CTRL           _IOWR ('V', 28, struct v4l2_control)
-#define VIDIOC_G_TUNER          _IOWR ('V', 29, struct v4l2_tuner)
-#define VIDIOC_S_TUNER          _IOW  ('V', 30, struct v4l2_tuner)
-#define VIDIOC_G_AUDIO          _IOR  ('V', 33, struct v4l2_audio)
-#define VIDIOC_S_AUDIO          _IOW  ('V', 34, struct v4l2_audio)
-#define VIDIOC_QUERYCTRL        _IOWR ('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_QUERYMENU        _IOWR ('V', 37, struct v4l2_querymenu)
-#define VIDIOC_G_INPUT          _IOR  ('V', 38, int)
-#define VIDIOC_S_INPUT          _IOWR ('V', 39, int)
-#define VIDIOC_G_OUTPUT         _IOR  ('V', 46, int)
-#define VIDIOC_S_OUTPUT         _IOWR ('V', 47, int)
-#define VIDIOC_ENUMOUTPUT       _IOWR ('V', 48, struct v4l2_output)
-#define VIDIOC_G_AUDOUT         _IOR  ('V', 49, struct v4l2_audioout)
-#define VIDIOC_S_AUDOUT         _IOW  ('V', 50, struct v4l2_audioout)
-#define VIDIOC_G_MODULATOR      _IOWR ('V', 54, struct v4l2_modulator)
-#define VIDIOC_S_MODULATOR      _IOW  ('V', 55, struct v4l2_modulator)
-#define VIDIOC_G_FREQUENCY      _IOWR ('V', 56, struct v4l2_frequency)
-#define VIDIOC_S_FREQUENCY      _IOW  ('V', 57, struct v4l2_frequency)
-#define VIDIOC_CROPCAP          _IOWR ('V', 58, struct v4l2_cropcap)
-#define VIDIOC_G_CROP           _IOWR ('V', 59, struct v4l2_crop)
-#define VIDIOC_S_CROP           _IOW  ('V', 60, struct v4l2_crop)
-#define VIDIOC_G_JPEGCOMP       _IOR  ('V', 61, struct v4l2_jpegcompression)
-#define VIDIOC_S_JPEGCOMP       _IOW  ('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD         _IOR  ('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT          _IOWR ('V', 64, struct v4l2_format)
-#define VIDIOC_ENUMAUDIO        _IOWR ('V', 65, struct v4l2_audio)
-#define VIDIOC_ENUMAUDOUT       _IOWR ('V', 66, struct v4l2_audioout)
-#define VIDIOC_G_PRIORITY       _IOR  ('V', 67, enum v4l2_priority)
-#define VIDIOC_S_PRIORITY       _IOW  ('V', 68, enum v4l2_priority)
-#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap)
-#define VIDIOC_LOG_STATUS       _IO   ('V', 70)
-#define VIDIOC_G_EXT_CTRLS      _IOWR ('V', 71, struct v4l2_ext_controls)
-#define VIDIOC_S_EXT_CTRLS      _IOWR ('V', 72, struct v4l2_ext_controls)
-#define VIDIOC_TRY_EXT_CTRLS    _IOWR ('V', 73, struct v4l2_ext_controls)
+#define VIDIOC_QUERYCAP          _IOR('V',  0, struct v4l2_capability)
+#define VIDIOC_RESERVED           _IO('V',  1)
+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
+#define VIDIOC_G_FMT            _IOWR('V',  4, struct v4l2_format)
+#define VIDIOC_S_FMT            _IOWR('V',  5, struct v4l2_format)
+#define VIDIOC_REQBUFS          _IOWR('V',  8, struct v4l2_requestbuffers)
+#define VIDIOC_QUERYBUF         _IOWR('V',  9, struct v4l2_buffer)
+#define VIDIOC_G_FBUF            _IOR('V', 10, struct v4l2_framebuffer)
+#define VIDIOC_S_FBUF            _IOW('V', 11, struct v4l2_framebuffer)
+#define VIDIOC_OVERLAY           _IOW('V', 14, int)
+#define VIDIOC_QBUF             _IOWR('V', 15, struct v4l2_buffer)
+#define VIDIOC_DQBUF            _IOWR('V', 17, struct v4l2_buffer)
+#define VIDIOC_STREAMON          _IOW('V', 18, int)
+#define VIDIOC_STREAMOFF         _IOW('V', 19, int)
+#define VIDIOC_G_PARM           _IOWR('V', 21, struct v4l2_streamparm)
+#define VIDIOC_S_PARM           _IOWR('V', 22, struct v4l2_streamparm)
+#define VIDIOC_G_STD             _IOR('V', 23, v4l2_std_id)
+#define VIDIOC_S_STD             _IOW('V', 24, v4l2_std_id)
+#define VIDIOC_ENUMSTD          _IOWR('V', 25, struct v4l2_standard)
+#define VIDIOC_ENUMINPUT        _IOWR('V', 26, struct v4l2_input)
+#define VIDIOC_G_CTRL           _IOWR('V', 27, struct v4l2_control)
+#define VIDIOC_S_CTRL           _IOWR('V', 28, struct v4l2_control)
+#define VIDIOC_G_TUNER          _IOWR('V', 29, struct v4l2_tuner)
+#define VIDIOC_S_TUNER           _IOW('V', 30, struct v4l2_tuner)
+#define VIDIOC_G_AUDIO           _IOR('V', 33, struct v4l2_audio)
+#define VIDIOC_S_AUDIO           _IOW('V', 34, struct v4l2_audio)
+#define VIDIOC_QUERYCTRL        _IOWR('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU        _IOWR('V', 37, struct v4l2_querymenu)
+#define VIDIOC_G_INPUT           _IOR('V', 38, int)
+#define VIDIOC_S_INPUT          _IOWR('V', 39, int)
+#define VIDIOC_G_OUTPUT          _IOR('V', 46, int)
+#define VIDIOC_S_OUTPUT         _IOWR('V', 47, int)
+#define VIDIOC_ENUMOUTPUT       _IOWR('V', 48, struct v4l2_output)
+#define VIDIOC_G_AUDOUT          _IOR('V', 49, struct v4l2_audioout)
+#define VIDIOC_S_AUDOUT          _IOW('V', 50, struct v4l2_audioout)
+#define VIDIOC_G_MODULATOR      _IOWR('V', 54, struct v4l2_modulator)
+#define VIDIOC_S_MODULATOR       _IOW('V', 55, struct v4l2_modulator)
+#define VIDIOC_G_FREQUENCY      _IOWR('V', 56, struct v4l2_frequency)
+#define VIDIOC_S_FREQUENCY       _IOW('V', 57, struct v4l2_frequency)
+#define VIDIOC_CROPCAP          _IOWR('V', 58, struct v4l2_cropcap)
+#define VIDIOC_G_CROP           _IOWR('V', 59, struct v4l2_crop)
+#define VIDIOC_S_CROP            _IOW('V', 60, struct v4l2_crop)
+#define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct v4l2_jpegcompression)
+#define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct v4l2_jpegcompression)
+#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
+#define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
+#define VIDIOC_LOG_STATUS         _IO('V', 70)
+#define VIDIOC_G_EXT_CTRLS      _IOWR('V', 71, struct v4l2_ext_controls)
+#define VIDIOC_S_EXT_CTRLS      _IOWR('V', 72, struct v4l2_ext_controls)
+#define VIDIOC_TRY_EXT_CTRLS    _IOWR('V', 73, struct v4l2_ext_controls)
 #if 1
-#define VIDIOC_ENUM_FRAMESIZES  _IOWR ('V', 74, struct v4l2_frmsizeenum)
-#define VIDIOC_ENUM_FRAMEINTERVALS      _IOWR ('V', 75, struct v4l2_frmivalenum)
-#define VIDIOC_G_ENC_INDEX      _IOR  ('V', 76, struct v4l2_enc_idx)
-#define VIDIOC_ENCODER_CMD      _IOWR ('V', 77, struct v4l2_encoder_cmd)
-#define VIDIOC_TRY_ENCODER_CMD  _IOWR ('V', 78, struct v4l2_encoder_cmd)
+#define VIDIOC_ENUM_FRAMESIZES  _IOWR('V', 74, struct v4l2_frmsizeenum)
+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
 
 /* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
-#define VIDIOC_DBG_S_REGISTER   _IOW  ('V', 79, struct v4l2_register)
-#define VIDIOC_DBG_G_REGISTER   _IOWR ('V', 80, struct v4l2_register)
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_register)
 
-#define VIDIOC_G_CHIP_IDENT     _IOWR ('V', 81, struct v4l2_chip_ident)
+#define VIDIOC_G_CHIP_IDENT     _IOWR('V', 81, struct v4l2_chip_ident)
 #endif
-#define VIDIOC_S_HW_FREQ_SEEK   _IOW  ('V', 82, struct v4l2_hw_freq_seek)
+#define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
 
 #ifdef __OLD_VIDIOC_
 /* for compatibility, will go away some day */
-#define VIDIOC_OVERLAY_OLD      _IOWR ('V', 14, int)
-#define VIDIOC_S_PARM_OLD       _IOW  ('V', 22, struct v4l2_streamparm)
-#define VIDIOC_S_CTRL_OLD       _IOW  ('V', 28, struct v4l2_control)
-#define VIDIOC_G_AUDIO_OLD      _IOWR ('V', 33, struct v4l2_audio)
-#define VIDIOC_G_AUDOUT_OLD     _IOWR ('V', 49, struct v4l2_audioout)
-#define VIDIOC_CROPCAP_OLD      _IOR  ('V', 58, struct v4l2_cropcap)
+#define VIDIOC_OVERLAY_OLD      _IOWR('V', 14, int)
+#define VIDIOC_S_PARM_OLD        _IOW('V', 22, struct v4l2_streamparm)
+#define VIDIOC_S_CTRL_OLD        _IOW('V', 28, struct v4l2_control)
+#define VIDIOC_G_AUDIO_OLD      _IOWR('V', 33, struct v4l2_audio)
+#define VIDIOC_G_AUDOUT_OLD     _IOWR('V', 49, struct v4l2_audioout)
+#define VIDIOC_CROPCAP_OLD       _IOR('V', 58, struct v4l2_cropcap)
 #endif
 
 #define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
 
 #endif /* __LINUX_VIDEODEV2_H */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/include/linux/videotext.h b/include/linux/videotext.h
index 018f92047ff8..3e68c8d1c7f7 100644
--- a/include/linux/videotext.h
+++ b/include/linux/videotext.h
@@ -45,10 +45,10 @@
 #define VTXIOCCLRCACHE_OLD 0x710b  /* clear cache on VTX-interface (if avail.) */
 #define VTXIOCSETVIRT_OLD  0x710c  /* turn on virtual mode (this disables TV-display) */
 
-/* 
+/*
  *      Definitions for VTXIOCGETINFO
  */
- 
+
 #define SAA5243 0
 #define SAA5246 1
 #define SAA5249 2
@@ -57,10 +57,10 @@
 
 typedef struct {
         int version_major, version_minor;       /* version of driver; if version_major changes, driver */
-                                                /* is not backward compatible!!! CHECK THIS!!! */  
+                                                /* is not backward compatible!!! CHECK THIS!!! */
         int numpages;                           /* number of page-buffers of vtx-chipset */
         int cct_type;                           /* type of vtx-chipset (SAA5243, SAA5246, SAA5248 or
-                                                 * SAA5249) */
+                                                 * SAA5249) */
 }
 vtx_info_t;
 
@@ -81,7 +81,7 @@ vtx_info_t;
 #define PGMASK_HOUR (HR_TEN | HR_UNIT)
 #define PGMASK_MINUTE (MIN_TEN | MIN_UNIT)
 
-typedef struct 
+typedef struct
 {
         int page;       /* number of requested page (hexadecimal) */
         int hour;       /* requested hour (hexadecimal) */
@@ -98,11 +98,11 @@ vtx_pagereq_t;
 /*
  *      Definitions for VTXIOC{GETSTAT,PUTSTAT}
  */
- 
+
 #define VTX_PAGESIZE (40 * 24)
 #define VTX_VIRTUALSIZE (40 * 49)
 
-typedef struct 
+typedef struct
 {
         int pagenum;                    /* number of page (hexadecimal) */
         int hour;                       /* hour (hexadecimal) */
@@ -121,5 +121,5 @@ typedef struct
         unsigned hamming : 1;           /* hamming-error occurred */
 }
 vtx_pageinfo_t;
- 
+
 #endif /* _VTX_H */
diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index db8823d45a7d..e69de29bb2d1 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,26 +0,0 @@
-/*
- */
-
-#ifndef AUDIOCHIP_H
-#define AUDIOCHIP_H
-
-enum audiochip {
-        AUDIO_CHIP_NONE,
-        AUDIO_CHIP_UNKNOWN,
-        /* Provided by video chip */
-        AUDIO_CHIP_INTERNAL,
-        /* Provided by tvaudio.c */
-        AUDIO_CHIP_TDA8425,
-        AUDIO_CHIP_TEA6300,
-        AUDIO_CHIP_TEA6420,
-        AUDIO_CHIP_TDA9840,
-        AUDIO_CHIP_TDA985X,
-        AUDIO_CHIP_TDA9874,
-        AUDIO_CHIP_PIC16C54,
-        /* Provided by msp3400.c */
-        AUDIO_CHIP_MSP34XX,
-        /* Provided by wm8775.c */
-        AUDIO_CHIP_WM8775
-};
-
-#endif /* AUDIOCHIP_H */
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 89c442eb8849..1d104096619c 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -2,6 +2,7 @@
 #define __SAA7146_VV__
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/saa7146.h>
 #include <media/videobuf-dma-sg.h>
 
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index 5660ea24996b..a8ad75a9152a 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -3,7 +3,12 @@
 
 struct tveeprom {
         u32 has_radio;
-        u32 has_ir;     /* bit 0: IR receiver present, bit 1: IR transmitter (blaster) present. -1 == unknown */
+        /* If has_ir == 0, then it is unknown what the IR capabilities are,
+           otherwise:
+           bit 0: 1 (= IR capabilities are known)
+           bit 1: IR receiver present
+           bit 2: IR transmitter (blaster) present */
+        u32 has_ir;
         u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */
 
         u32 tuner_type;
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 2a527742701a..41b509babf3f 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -90,7 +90,10 @@ enum {
         /* module m52790: just ident 52790 */
         V4L2_IDENT_M52790 = 52790,
 
-        /* module msp34xx: reserved range 34000-34999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
+                                        use internally (tveeprom.c). */
+
         V4L2_IDENT_MSP3400B = 34002,
         V4L2_IDENT_MSP3410B = 34102,
 
@@ -142,7 +145,7 @@ enum {
         V4L2_IDENT_MSP3457G = 34577,
         V4L2_IDENT_MSP3467G = 34677,
 
-        /* module msp44xx: reserved range 44000-44999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
         V4L2_IDENT_MSP4400G = 44007,
         V4L2_IDENT_MSP4410G = 44107,
         V4L2_IDENT_MSP4420G = 44207,
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 020d05758bd8..07d3a9a575d1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -28,12 +28,6 @@
 
 #include <media/v4l2-dev.h>
 
-/* v4l debugging and diagnostics */
-
-/* Debug bitmask flags to be used on V4L2 */
-#define V4L2_DEBUG_IOCTL     0x01
-#define V4L2_DEBUG_IOCTL_ARG 0x02
-
 /* Common printk constucts for v4l-i2c drivers. These macros create a unique
    prefix consisting of the driver name, the adapter number and the i2c
    address. */
@@ -61,21 +55,20 @@
                         v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
         } while (0)
 
+/* ------------------------------------------------------------------------- */
 
-/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
-#define v4l_print_ioctl(name, cmd)               \
-        do {                                     \
-                printk(KERN_DEBUG "%s: ", name); \
-                v4l_printk_ioctl(cmd);           \
-        } while (0)
+/* Priority helper functions */
 
-/* Use this macro in I2C drivers where 'client' is the struct i2c_client
-   pointer */
-#define v4l_i2c_print_ioctl(client, cmd)                   \
-        do {                                               \
-                v4l_client_printk(KERN_DEBUG, client, ""); \
-                v4l_printk_ioctl(cmd);                     \
-        } while (0)
+struct v4l2_prio_state {
+        atomic_t prios[4];
+};
+int v4l2_prio_init(struct v4l2_prio_state *global);
+int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
+                     enum v4l2_priority new);
+int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
+int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
+enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 33f379b1ecfe..2745e1afc722 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,6 @@
 #ifndef _V4L2_DEV_H
 #define _V4L2_DEV_H
 
-#define OBSOLETE_OWNER   1 /* to be removed soon */
 #define OBSOLETE_DEVDATA 1 /* to be removed soon */
 
 #include <linux/poll.h>
@@ -17,11 +16,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/compiler.h> /* need __user */
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#include <linux/videodev.h>
-#else
 #include <linux/videodev2.h>
-#endif
 
 #define VIDEO_MAJOR     81
 /* Minor device allocation */
@@ -39,42 +34,7 @@
 #define VFL_TYPE_RADIO          2
 #define VFL_TYPE_VTX            3
 
-/*  Video standard functions  */
-extern const char *v4l2_norm_to_name(v4l2_std_id id);
-extern int v4l2_video_std_construct(struct v4l2_standard *vs,
-                                    int id, const char *name);
-/* Prints the ioctl in a human-readable format */
-extern void v4l_printk_ioctl(unsigned int cmd);
-
-/* prority handling */
-struct v4l2_prio_state {
-        atomic_t prios[4];
-};
-int v4l2_prio_init(struct v4l2_prio_state *global);
-int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
-                     enum v4l2_priority new);
-int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
-int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
-enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
-int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
-
-/* names for fancy debug output */
-extern const char *v4l2_field_names[];
-extern const char *v4l2_type_names[];
-
-/*  Compatibility layer interface  --  v4l1-compat module */
-typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
-                           unsigned int cmd, void *arg);
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
-                               int cmd, void *arg, v4l2_kioctl driver_ioctl);
-#else
-#define v4l_compat_translate_ioctl(inode,file,cmd,arg,ioctl) -EINVAL
-#endif
-
-/* 32 Bits compatibility layer for 64 bits processors */
-extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
-                                unsigned long arg);
+struct v4l2_ioctl_callbacks;
 
 /*
  * Newer version of video_device, handled by videodev2.c
@@ -88,18 +48,17 @@ struct video_device
         const struct file_operations *fops;
 
         /* sysfs */
-        struct device class_dev;        /* v4l device */
-        struct device *dev;             /* device parent */
+        struct device dev;              /* v4l device */
+        struct device *parent;          /* device parent */
 
         /* device info */
         char name[32];
-        int type;       /* v4l1 */
-        int type2;      /* v4l2 */
+        int vfl_type;
         int minor;
-        /* attribute to diferentiate multiple indexs on one physical device */
+        /* attribute to differentiate multiple indices on one physical device */
         int index;
 
-        int debug;      /* Activates debug level*/
+        int debug;                      /* Activates debug level*/
 
         /* Video standard vars */
         v4l2_std_id tvnorms;            /* Supported tv norms */
@@ -109,285 +68,36 @@ struct video_device
         void (*release)(struct video_device *vfd);
 
         /* ioctl callbacks */
+        const struct v4l2_ioctl_ops *ioctl_ops;
 
-        /* VIDIOC_QUERYCAP handler */
-        int (*vidioc_querycap)(struct file *file, void *fh, struct v4l2_capability *cap);
-
-        /* Priority handling */
-        int (*vidioc_g_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority *p);
-        int (*vidioc_s_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority p);
-
-        /* VIDIOC_ENUM_FMT handlers */
-        int (*vidioc_enum_fmt_vid_cap)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-        int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-        int (*vidioc_enum_fmt_vid_out)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-#if 1
-        /* deprecated, will be removed in 2.6.28 */
-        int (*vidioc_enum_fmt_vbi_cap)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-#endif
-        int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-
-        /* VIDIOC_G_FMT handlers */
-        int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vbi_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vbi_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-
-        /* VIDIOC_S_FMT handlers */
-        int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vbi_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vbi_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-
-        /* VIDIOC_TRY_FMT handlers */
-        int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_out)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vbi_cap)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vbi_out)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-
-        /* Buffer handlers */
-        int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
-        int (*vidioc_querybuf)(struct file *file, void *fh, struct v4l2_buffer *b);
-        int (*vidioc_qbuf)    (struct file *file, void *fh, struct v4l2_buffer *b);
-        int (*vidioc_dqbuf)   (struct file *file, void *fh, struct v4l2_buffer *b);
-
-
-        int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-                        /* buffer type is struct vidio_mbuf * */
-        int (*vidiocgmbuf)  (struct file *file, void *fh, struct video_mbuf *p);
-#endif
-        int (*vidioc_g_fbuf)   (struct file *file, void *fh,
-                                struct v4l2_framebuffer *a);
-        int (*vidioc_s_fbuf)   (struct file *file, void *fh,
-                                struct v4l2_framebuffer *a);
-
-                /* Stream on/off */
-        int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i);
-        int (*vidioc_streamoff)(struct file *file, void *fh, enum v4l2_buf_type i);
-
-                /* Standard handling
-                        ENUMSTD is handled by videodev.c
-                 */
-        int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm);
-        int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm);
-        int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a);
-
-                /* Input handling */
-        int (*vidioc_enum_input)(struct file *file, void *fh,
-                                 struct v4l2_input *inp);
-        int (*vidioc_g_input)   (struct file *file, void *fh, unsigned int *i);
-        int (*vidioc_s_input)   (struct file *file, void *fh, unsigned int i);
-
-                /* Output handling */
-        int (*vidioc_enum_output) (struct file *file, void *fh,
-                                  struct v4l2_output *a);
-        int (*vidioc_g_output)   (struct file *file, void *fh, unsigned int *i);
-        int (*vidioc_s_output)   (struct file *file, void *fh, unsigned int i);
-
-                /* Control handling */
-        int (*vidioc_queryctrl)        (struct file *file, void *fh,
-                                        struct v4l2_queryctrl *a);
-        int (*vidioc_g_ctrl)           (struct file *file, void *fh,
-                                        struct v4l2_control *a);
-        int (*vidioc_s_ctrl)           (struct file *file, void *fh,
-                                        struct v4l2_control *a);
-        int (*vidioc_g_ext_ctrls)      (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_s_ext_ctrls)      (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_try_ext_ctrls)    (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_querymenu)        (struct file *file, void *fh,
-                                        struct v4l2_querymenu *a);
-
-        /* Audio ioctls */
-        int (*vidioc_enumaudio)        (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-        int (*vidioc_g_audio)          (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-        int (*vidioc_s_audio)          (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-
-        /* Audio out ioctls */
-        int (*vidioc_enumaudout)       (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_g_audout)         (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_s_audout)         (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_g_modulator)      (struct file *file, void *fh,
-                                        struct v4l2_modulator *a);
-        int (*vidioc_s_modulator)      (struct file *file, void *fh,
-                                        struct v4l2_modulator *a);
-        /* Crop ioctls */
-        int (*vidioc_cropcap)          (struct file *file, void *fh,
-                                        struct v4l2_cropcap *a);
-        int (*vidioc_g_crop)           (struct file *file, void *fh,
-                                        struct v4l2_crop *a);
-        int (*vidioc_s_crop)           (struct file *file, void *fh,
-                                        struct v4l2_crop *a);
-        /* Compression ioctls */
-        int (*vidioc_g_jpegcomp)       (struct file *file, void *fh,
-                                        struct v4l2_jpegcompression *a);
-        int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,
-                                        struct v4l2_jpegcompression *a);
-        int (*vidioc_g_enc_index)      (struct file *file, void *fh,
-                                        struct v4l2_enc_idx *a);
-        int (*vidioc_encoder_cmd)      (struct file *file, void *fh,
-                                        struct v4l2_encoder_cmd *a);
-        int (*vidioc_try_encoder_cmd)  (struct file *file, void *fh,
-                                        struct v4l2_encoder_cmd *a);
-
-        /* Stream type-dependent parameter ioctls */
-        int (*vidioc_g_parm)           (struct file *file, void *fh,
-                                        struct v4l2_streamparm *a);
-        int (*vidioc_s_parm)           (struct file *file, void *fh,
-                                        struct v4l2_streamparm *a);
-
-        /* Tuner ioctls */
-        int (*vidioc_g_tuner)          (struct file *file, void *fh,
-                                        struct v4l2_tuner *a);
-        int (*vidioc_s_tuner)          (struct file *file, void *fh,
-                                        struct v4l2_tuner *a);
-        int (*vidioc_g_frequency)      (struct file *file, void *fh,
-                                        struct v4l2_frequency *a);
-        int (*vidioc_s_frequency)      (struct file *file, void *fh,
-                                        struct v4l2_frequency *a);
-
-        /* Sliced VBI cap */
-        int (*vidioc_g_sliced_vbi_cap) (struct file *file, void *fh,
-                                        struct v4l2_sliced_vbi_cap *a);
-
-        /* Log status ioctl */
-        int (*vidioc_log_status)       (struct file *file, void *fh);
-
-        int (*vidioc_s_hw_freq_seek)   (struct file *file, void *fh,
-                                        struct v4l2_hw_freq_seek *a);
-
-        /* Debugging ioctls */
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        int (*vidioc_g_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
-        int (*vidioc_s_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
-#endif
-        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
-                                        struct v4l2_chip_ident *chip);
-
-        /* For other private ioctls */
-        int (*vidioc_default)          (struct file *file, void *fh,
-                                        int cmd, void *arg);
-
-
-#ifdef OBSOLETE_OWNER /* to be removed soon */
-/* obsolete -- fops->owner is used instead */
-struct module *owner;
-/* dev->driver_data will be used instead some day.
-        * Use the video_{get|set}_drvdata() helper functions,
-        * so the switch over will be transparent for you.
-        * Or use {pci|usb}_{get|set}_drvdata() directly. */
-void *priv;
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
+        /* dev->driver_data will be used instead some day.
+         * Use the video_{get|set}_drvdata() helper functions,
+         * so the switch over will be transparent for you.
+         * Or use {pci|usb}_{get|set}_drvdata() directly. */
+        void *priv;
 #endif
 
-        /* for videodev.c intenal usage -- please don't touch */
+        /* for videodev.c internal usage -- please don't touch */
         int users;                     /* video_exclusive_{open|close} ... */
         struct mutex lock;             /* ... helper function uses these   */
 };
 
 /* Class-dev to video-device */
-#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
+#define to_video_device(cd) container_of(cd, struct video_device, dev)
 
 /* Version 2 functions */
 extern int video_register_device(struct video_device *vfd, int type, int nr);
 int video_register_device_index(struct video_device *vfd, int type, int nr,
                                         int index);
 void video_unregister_device(struct video_device *);
-extern int video_ioctl2(struct inode *inode, struct file *file,
-                          unsigned int cmd, unsigned long arg);
 
 /* helper functions to alloc / release struct video_device, the
    later can be used for video_device->release() */
 struct video_device *video_device_alloc(void);
 void video_device_release(struct video_device *vfd);
 
-/* Include support for obsoleted stuff */
-extern int video_usercopy(struct inode *inode, struct file *file,
-                          unsigned int cmd, unsigned long arg,
-                          int (*func)(struct inode *inode, struct file *file,
-                                      unsigned int cmd, void *arg));
-
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#include <linux/mm.h>
-
-static inline int __must_check
-video_device_create_file(struct video_device *vfd,
-                         struct device_attribute *attr)
-{
-        int ret = device_create_file(&vfd->class_dev, attr);
-        if (ret < 0)
-                printk(KERN_WARNING "%s error: %d\n", __func__, ret);
-        return ret;
-}
-static inline void
-video_device_remove_file(struct video_device *vfd,
-                         struct device_attribute *attr)
-{
-        device_remove_file(&vfd->class_dev, attr);
-}
-
-#endif /* CONFIG_VIDEO_V4L1_COMPAT */
-
-#ifdef OBSOLETE_OWNER /* to be removed soon */
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *dev)
 {
@@ -399,9 +109,6 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
         dev->priv = data;
 }
 
-#endif
-
-#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* Obsolete stuff - Still needed for radio devices and obsolete drivers */
 extern struct video_device* video_devdata(struct file*);
 extern int video_exclusive_open(struct inode *inode, struct file *file);
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
new file mode 100644
index 000000000000..dc6404618555
--- /dev/null
+++ b/include/media/v4l2-ioctl.h
@@ -0,0 +1,301 @@
+/*
+ *
+ *      V 4 L 2   D R I V E R   H E L P E R   A P I
+ *
+ * Moved from videodev2.h
+ *
+ *      Some commonly needed functions for drivers (v4l2-common.o module)
+ */
+#ifndef _V4L2_IOCTL_H
+#define _V4L2_IOCTL_H
+
+#include <linux/poll.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/mutex.h>
+#include <linux/compiler.h> /* need __user */
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+#include <linux/videodev.h>
+#else
+#include <linux/videodev2.h>
+#endif
+
+struct v4l2_ioctl_ops {
+        /* ioctl callbacks */
+
+        /* VIDIOC_QUERYCAP handler */
+        int (*vidioc_querycap)(struct file *file, void *fh, struct v4l2_capability *cap);
+
+        /* Priority handling */
+        int (*vidioc_g_priority)   (struct file *file, void *fh,
+                                    enum v4l2_priority *p);
+        int (*vidioc_s_priority)   (struct file *file, void *fh,
+                                    enum v4l2_priority p);
+
+        /* VIDIOC_ENUM_FMT handlers */
+        int (*vidioc_enum_fmt_vid_cap)     (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_vid_out)     (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
+#if 1
+        /* deprecated, will be removed in 2.6.28 */
+        int (*vidioc_enum_fmt_vbi_cap)     (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
+#endif
+        int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
+
+        /* VIDIOC_G_FMT handlers */
+        int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_vid_out)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_vbi_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_vbi_out)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+
+        /* VIDIOC_S_FMT handlers */
+        int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_vid_out)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_vbi_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_vbi_out)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+        int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
+                                        struct v4l2_format *f);
+
+        /* VIDIOC_TRY_FMT handlers */
+        int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_vid_out)    (struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_vbi_cap)    (struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_vbi_out)    (struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
+        int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
+
+        /* Buffer handlers */
+        int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
+        int (*vidioc_querybuf)(struct file *file, void *fh, struct v4l2_buffer *b);
+        int (*vidioc_qbuf)    (struct file *file, void *fh, struct v4l2_buffer *b);
+        int (*vidioc_dqbuf)   (struct file *file, void *fh, struct v4l2_buffer *b);
+
+
+        int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+                        /* buffer type is struct vidio_mbuf * */
+        int (*vidiocgmbuf)  (struct file *file, void *fh, struct video_mbuf *p);
+#endif
+        int (*vidioc_g_fbuf)   (struct file *file, void *fh,
+                                struct v4l2_framebuffer *a);
+        int (*vidioc_s_fbuf)   (struct file *file, void *fh,
+                                struct v4l2_framebuffer *a);
+
+                /* Stream on/off */
+        int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i);
+        int (*vidioc_streamoff)(struct file *file, void *fh, enum v4l2_buf_type i);
+
+                /* Standard handling
+                        ENUMSTD is handled by videodev.c
+                 */
+        int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm);
+        int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm);
+        int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a);
+
+                /* Input handling */
+        int (*vidioc_enum_input)(struct file *file, void *fh,
+                                 struct v4l2_input *inp);
+        int (*vidioc_g_input)   (struct file *file, void *fh, unsigned int *i);
+        int (*vidioc_s_input)   (struct file *file, void *fh, unsigned int i);
+
+                /* Output handling */
+        int (*vidioc_enum_output) (struct file *file, void *fh,
+                                  struct v4l2_output *a);
+        int (*vidioc_g_output)   (struct file *file, void *fh, unsigned int *i);
+        int (*vidioc_s_output)   (struct file *file, void *fh, unsigned int i);
+
+                /* Control handling */
+        int (*vidioc_queryctrl)        (struct file *file, void *fh,
+                                        struct v4l2_queryctrl *a);
+        int (*vidioc_g_ctrl)           (struct file *file, void *fh,
+                                        struct v4l2_control *a);
+        int (*vidioc_s_ctrl)           (struct file *file, void *fh,
+                                        struct v4l2_control *a);
+        int (*vidioc_g_ext_ctrls)      (struct file *file, void *fh,
+                                        struct v4l2_ext_controls *a);
+        int (*vidioc_s_ext_ctrls)      (struct file *file, void *fh,
+                                        struct v4l2_ext_controls *a);
+        int (*vidioc_try_ext_ctrls)    (struct file *file, void *fh,
+                                        struct v4l2_ext_controls *a);
+        int (*vidioc_querymenu)        (struct file *file, void *fh,
+                                        struct v4l2_querymenu *a);
+
+        /* Audio ioctls */
+        int (*vidioc_enumaudio)        (struct file *file, void *fh,
+                                        struct v4l2_audio *a);
+        int (*vidioc_g_audio)          (struct file *file, void *fh,
+                                        struct v4l2_audio *a);
+        int (*vidioc_s_audio)          (struct file *file, void *fh,
+                                        struct v4l2_audio *a);
+
+        /* Audio out ioctls */
+        int (*vidioc_enumaudout)       (struct file *file, void *fh,
+                                        struct v4l2_audioout *a);
+        int (*vidioc_g_audout)         (struct file *file, void *fh,
+                                        struct v4l2_audioout *a);
+        int (*vidioc_s_audout)         (struct file *file, void *fh,
+                                        struct v4l2_audioout *a);
+        int (*vidioc_g_modulator)      (struct file *file, void *fh,
+                                        struct v4l2_modulator *a);
+        int (*vidioc_s_modulator)      (struct file *file, void *fh,
+                                        struct v4l2_modulator *a);
+        /* Crop ioctls */
+        int (*vidioc_cropcap)          (struct file *file, void *fh,
+                                        struct v4l2_cropcap *a);
+        int (*vidioc_g_crop)           (struct file *file, void *fh,
+                                        struct v4l2_crop *a);
+        int (*vidioc_s_crop)           (struct file *file, void *fh,
+                                        struct v4l2_crop *a);
+        /* Compression ioctls */
+        int (*vidioc_g_jpegcomp)       (struct file *file, void *fh,
+                                        struct v4l2_jpegcompression *a);
+        int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,
+                                        struct v4l2_jpegcompression *a);
+        int (*vidioc_g_enc_index)      (struct file *file, void *fh,
+                                        struct v4l2_enc_idx *a);
+        int (*vidioc_encoder_cmd)      (struct file *file, void *fh,
+                                        struct v4l2_encoder_cmd *a);
+        int (*vidioc_try_encoder_cmd)  (struct file *file, void *fh,
+                                        struct v4l2_encoder_cmd *a);
+
+        /* Stream type-dependent parameter ioctls */
+        int (*vidioc_g_parm)           (struct file *file, void *fh,
+                                        struct v4l2_streamparm *a);
+        int (*vidioc_s_parm)           (struct file *file, void *fh,
+                                        struct v4l2_streamparm *a);
+
+        /* Tuner ioctls */
+        int (*vidioc_g_tuner)          (struct file *file, void *fh,
+                                        struct v4l2_tuner *a);
+        int (*vidioc_s_tuner)          (struct file *file, void *fh,
+                                        struct v4l2_tuner *a);
+        int (*vidioc_g_frequency)      (struct file *file, void *fh,
+                                        struct v4l2_frequency *a);
+        int (*vidioc_s_frequency)      (struct file *file, void *fh,
+                                        struct v4l2_frequency *a);
+
+        /* Sliced VBI cap */
+        int (*vidioc_g_sliced_vbi_cap) (struct file *file, void *fh,
+                                        struct v4l2_sliced_vbi_cap *a);
+
+        /* Log status ioctl */
+        int (*vidioc_log_status)       (struct file *file, void *fh);
+
+        int (*vidioc_s_hw_freq_seek)   (struct file *file, void *fh,
+                                        struct v4l2_hw_freq_seek *a);
+
+        /* Debugging ioctls */
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        int (*vidioc_g_register)       (struct file *file, void *fh,
+                                        struct v4l2_register *reg);
+        int (*vidioc_s_register)       (struct file *file, void *fh,
+                                        struct v4l2_register *reg);
+#endif
+        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
+                                        struct v4l2_chip_ident *chip);
+
+        /* For other private ioctls */
+        int (*vidioc_default)          (struct file *file, void *fh,
+                                        int cmd, void *arg);
+};
+
+
+/* v4l debugging and diagnostics */
+
+/* Debug bitmask flags to be used on V4L2 */
+#define V4L2_DEBUG_IOCTL     0x01
+#define V4L2_DEBUG_IOCTL_ARG 0x02
+
+/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
+#define v4l_print_ioctl(name, cmd)               \
+        do {                                     \
+                printk(KERN_DEBUG "%s: ", name); \
+                v4l_printk_ioctl(cmd);           \
+        } while (0)
+
+/* Use this macro in I2C drivers where 'client' is the struct i2c_client
+   pointer */
+#define v4l_i2c_print_ioctl(client, cmd)                   \
+        do {                                               \
+                v4l_client_printk(KERN_DEBUG, client, ""); \
+                v4l_printk_ioctl(cmd);                     \
+        } while (0)
+
+/*  Video standard functions  */
+extern const char *v4l2_norm_to_name(v4l2_std_id id);
+extern int v4l2_video_std_construct(struct v4l2_standard *vs,
+                                    int id, const char *name);
+/* Prints the ioctl in a human-readable format */
+extern void v4l_printk_ioctl(unsigned int cmd);
+
+/* names for fancy debug output */
+extern const char *v4l2_field_names[];
+extern const char *v4l2_type_names[];
+
+/*  Compatibility layer interface  --  v4l1-compat module */
+typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
+                           unsigned int cmd, void *arg);
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
+                               int cmd, void *arg, v4l2_kioctl driver_ioctl);
+#else
+#define v4l_compat_translate_ioctl(inode, file, cmd, arg, ioctl) (-EINVAL)
+#endif
+
+/* 32 Bits compatibility layer for 64 bits processors */
+extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
+                                unsigned long arg);
+
+extern int video_ioctl2(struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg);
+
+/* Include support for obsoleted stuff */
+extern int video_usercopy(struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg,
+                          int (*func)(struct inode *inode, struct file *file,
+                                      unsigned int cmd, void *arg));
+
+#endif /* _V4L2_IOCTL_H */
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 2d5c18514a2d..113028fb8f66 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -608,6 +608,8 @@ extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
 extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
 extern int ipv6_sysctl_register(void);
 extern void ipv6_sysctl_unregister(void);
+extern int ipv6_static_sysctl_register(void);
+extern void ipv6_static_sysctl_unregister(void);
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/include/net/route.h b/include/net/route.h
index 3140cc500854..4f0d8c14736c 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -204,6 +204,4 @@ static inline struct inet_peer *rt_get_peer(struct rtable *rt)
         return rt->peer;
 }
 
-extern ctl_table ipv4_route_table[];
-
 #endif  /* _ROUTE_H */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 00137a7769ee..5c40cc537d4c 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -106,6 +106,7 @@
 #define VARIABLE_LENGTH_CMD   0x7f
 #define REPORT_LUNS           0xa0
 #define MAINTENANCE_IN        0xa3
+#define MAINTENANCE_OUT       0xa4
 #define MOVE_MEDIUM           0xa5
 #define EXCHANGE_MEDIUM       0xa6
 #define READ_12               0xa8
@@ -125,6 +126,8 @@
 #define SAI_READ_CAPACITY_16  0x10
 /* values for maintenance in */
 #define MI_REPORT_TARGET_PGS  0x0a
+/* values for maintenance out */
+#define MO_SET_TARGET_PGS     0x0a
 
 /* Values for T10/04-262r7 */
 #define ATA_16                0x85      /* 16-byte pass-thru */
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 66c944849d6b..f9f6e793575c 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -77,6 +77,9 @@ struct scsi_cmnd {
         int allowed;
         int timeout_per_command;
 
+        unsigned char prot_op;
+        unsigned char prot_type;
+
         unsigned short cmd_len;
         enum dma_data_direction sc_data_direction;
 
@@ -87,6 +90,8 @@ struct scsi_cmnd {
 
         /* These elements define the operation we ultimately want to perform */
         struct scsi_data_buffer sdb;
+        struct scsi_data_buffer *prot_sdb;
+
         unsigned underflow;     /* Return error if less than
                                    this amount is transferred */
 
@@ -208,4 +213,85 @@ static inline int scsi_sg_copy_to_buffer(struct scsi_cmnd *cmd,
                                  buf, buflen);
 }
 
+/*
+ * The operations below are hints that tell the controller driver how
+ * to handle I/Os with DIF or similar types of protection information.
+ */
+enum scsi_prot_operations {
+        /* Normal I/O */
+        SCSI_PROT_NORMAL = 0,
+
+        /* OS-HBA: Protected, HBA-Target: Unprotected */
+        SCSI_PROT_READ_INSERT,
+        SCSI_PROT_WRITE_STRIP,
+
+        /* OS-HBA: Unprotected, HBA-Target: Protected */
+        SCSI_PROT_READ_STRIP,
+        SCSI_PROT_WRITE_INSERT,
+
+        /* OS-HBA: Protected, HBA-Target: Protected */
+        SCSI_PROT_READ_PASS,
+        SCSI_PROT_WRITE_PASS,
+
+        /* OS-HBA: Protected, HBA-Target: Protected, checksum conversion */
+        SCSI_PROT_READ_CONVERT,
+        SCSI_PROT_WRITE_CONVERT,
+};
+
+static inline void scsi_set_prot_op(struct scsi_cmnd *scmd, unsigned char op)
+{
+        scmd->prot_op = op;
+}
+
+static inline unsigned char scsi_get_prot_op(struct scsi_cmnd *scmd)
+{
+        return scmd->prot_op;
+}
+
+/*
+ * The controller usually does not know anything about the target it
+ * is communicating with.  However, when DIX is enabled the controller
+ * must be know target type so it can verify the protection
+ * information passed along with the I/O.
+ */
+enum scsi_prot_target_type {
+        SCSI_PROT_DIF_TYPE0 = 0,
+        SCSI_PROT_DIF_TYPE1,
+        SCSI_PROT_DIF_TYPE2,
+        SCSI_PROT_DIF_TYPE3,
+};
+
+static inline void scsi_set_prot_type(struct scsi_cmnd *scmd, unsigned char type)
+{
+        scmd->prot_type = type;
+}
+
+static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd)
+{
+        return scmd->prot_type;
+}
+
+static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)
+{
+        return scmd->request->sector;
+}
+
+static inline unsigned scsi_prot_sg_count(struct scsi_cmnd *cmd)
+{
+        return cmd->prot_sdb ? cmd->prot_sdb->table.nents : 0;
+}
+
+static inline struct scatterlist *scsi_prot_sglist(struct scsi_cmnd *cmd)
+{
+        return cmd->prot_sdb ? cmd->prot_sdb->table.sgl : NULL;
+}
+
+static inline struct scsi_data_buffer *scsi_prot(struct scsi_cmnd *cmd)
+{
+        return cmd->prot_sdb;
+}
+
+#define scsi_for_each_prot_sg(cmd, sg, nseg, __i)               \
+        for_each_sg(scsi_prot_sglist(cmd), sg, nseg, __i)
+
 #endif /* _SCSI_SCSI_CMND_H */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 6467f78b191f..291d56a19167 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -140,7 +140,8 @@ struct scsi_device {
         unsigned fix_capacity:1;        /* READ_CAPACITY is too high by 1 */
         unsigned guess_capacity:1;      /* READ_CAPACITY might be too high by 1 */
         unsigned retry_hwerror:1;       /* Retry HARDWARE_ERROR */
-        unsigned last_sector_bug:1;     /* Always read last sector in a 1 sector read */
+        unsigned last_sector_bug:1;     /* do not use multisector accesses on
+                                           SD_LAST_BUGGY_SECTORS */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
         struct list_head event_list;    /* asserted events */
@@ -167,15 +168,22 @@ struct scsi_device {
         unsigned long           sdev_data[0];
 } __attribute__((aligned(sizeof(unsigned long))));
 
+struct scsi_dh_devlist {
+        char *vendor;
+        char *model;
+};
+
 struct scsi_device_handler {
         /* Used by the infrastructure */
         struct list_head list; /* list of scsi_device_handlers */
-        struct notifier_block nb;
 
         /* Filled by the hardware handler */
         struct module *module;
         const char *name;
+        const struct scsi_dh_devlist *devlist;
         int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
+        int (*attach)(struct scsi_device *);
+        void (*detach)(struct scsi_device *);
         int (*activate)(struct scsi_device *);
         int (*prep_fn)(struct scsi_device *, struct request *);
 };
@@ -416,6 +424,11 @@ static inline int scsi_device_enclosure(struct scsi_device *sdev)
         return sdev->inquiry[6] & (1<<6);
 }
 
+static inline int scsi_device_protection(struct scsi_device *sdev)
+{
+        return sdev->inquiry[5] & (1<<0);
+}
+
 #define MODULE_ALIAS_SCSI_DEVICE(type) \
         MODULE_ALIAS("scsi:t-" __stringify(type) "*")
 #define SCSI_DEVICE_MODALIAS_FMT "scsi:t-0x%02x"
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index 3ad2303d1a16..33efce20c26c 100644
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -32,6 +32,7 @@ enum {
          */
         SCSI_DH_DEV_FAILED,     /* generic device error */
         SCSI_DH_DEV_TEMP_BUSY,
+        SCSI_DH_DEV_UNSUPP,     /* device handler not supported */
         SCSI_DH_DEVICE_MAX,     /* max device blkerr definition */
 
         /*
@@ -57,6 +58,8 @@ enum {
 #if defined(CONFIG_SCSI_DH) || defined(CONFIG_SCSI_DH_MODULE)
 extern int scsi_dh_activate(struct request_queue *);
 extern int scsi_dh_handler_exist(const char *);
+extern int scsi_dh_attach(struct request_queue *, const char *);
+extern void scsi_dh_detach(struct request_queue *);
 #else
 static inline int scsi_dh_activate(struct request_queue *req)
 {
@@ -66,4 +69,12 @@ static inline int scsi_dh_handler_exist(const char *name)
 {
         return 0;
 }
+static inline int scsi_dh_attach(struct request_queue *req, const char *name)
+{
+        return SCSI_DH_NOSYS;
+}
+static inline void scsi_dh_detach(struct request_queue *q)
+{
+        return;
+}
 #endif
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 2a9add21267d..06a8790893ef 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -74,7 +74,9 @@ struct scsi_eh_save {
         /* saved state */
         int result;
         enum dma_data_direction data_direction;
+        unsigned underflow;
         unsigned char cmd_len;
+        unsigned char prot_op;
         unsigned char *cmnd;
         struct scsi_data_buffer sdb;
         struct request *next_rq;
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index a594bac4a77d..44a55d1bf530 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -547,7 +547,7 @@ struct Scsi_Host {
         unsigned int host_failed;          /* commands that failed. */
         unsigned int host_eh_scheduled;    /* EH scheduled without command */
     
-        unsigned short host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */
+        unsigned int host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */
         int resetting; /* if set, it means that last_reset is a valid value */
         unsigned long last_reset;
 
@@ -636,6 +636,10 @@ struct Scsi_Host {
          */
         unsigned int max_host_blocked;
 
+        /* Protection Information */
+        unsigned int prot_capabilities;
+        unsigned char prot_guard_type;
+
         /*
          * q used for scsi_tgt msgs, async events or any other requests that
          * need to be processed in userspace
@@ -756,6 +760,86 @@ extern struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
 extern void scsi_free_host_dev(struct scsi_device *);
 extern struct scsi_device *scsi_get_host_dev(struct Scsi_Host *);
 
+/*
+ * DIF defines the exchange of protection information between
+ * initiator and SBC block device.
+ *
+ * DIX defines the exchange of protection information between OS and
+ * initiator.
+ */
+enum scsi_host_prot_capabilities {
+        SHOST_DIF_TYPE1_PROTECTION = 1 << 0, /* T10 DIF Type 1 */
+        SHOST_DIF_TYPE2_PROTECTION = 1 << 1, /* T10 DIF Type 2 */
+        SHOST_DIF_TYPE3_PROTECTION = 1 << 2, /* T10 DIF Type 3 */
+
+        SHOST_DIX_TYPE0_PROTECTION = 1 << 3, /* DIX between OS and HBA only */
+        SHOST_DIX_TYPE1_PROTECTION = 1 << 4, /* DIX with DIF Type 1 */
+        SHOST_DIX_TYPE2_PROTECTION = 1 << 5, /* DIX with DIF Type 2 */
+        SHOST_DIX_TYPE3_PROTECTION = 1 << 6, /* DIX with DIF Type 3 */
+};
+
+/*
+ * SCSI hosts which support the Data Integrity Extensions must
+ * indicate their capabilities by setting the prot_capabilities using
+ * this call.
+ */
+static inline void scsi_host_set_prot(struct Scsi_Host *shost, unsigned int mask)
+{
+        shost->prot_capabilities = mask;
+}
+
+static inline unsigned int scsi_host_get_prot(struct Scsi_Host *shost)
+{
+        return shost->prot_capabilities;
+}
+
+static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsigned int target_type)
+{
+        switch (target_type) {
+        case 1: return shost->prot_capabilities & SHOST_DIF_TYPE1_PROTECTION;
+        case 2: return shost->prot_capabilities & SHOST_DIF_TYPE2_PROTECTION;
+        case 3: return shost->prot_capabilities & SHOST_DIF_TYPE3_PROTECTION;
+        }
+
+        return 0;
+}
+
+static inline unsigned int scsi_host_dix_capable(struct Scsi_Host *shost, unsigned int target_type)
+{
+        switch (target_type) {
+        case 0: return shost->prot_capabilities & SHOST_DIX_TYPE0_PROTECTION;
+        case 1: return shost->prot_capabilities & SHOST_DIX_TYPE1_PROTECTION;
+        case 2: return shost->prot_capabilities & SHOST_DIX_TYPE2_PROTECTION;
+        case 3: return shost->prot_capabilities & SHOST_DIX_TYPE3_PROTECTION;
+        }
+
+        return 0;
+}
+
+/*
+ * All DIX-capable initiators must support the T10-mandated CRC
+ * checksum.  Controllers can optionally implement the IP checksum
+ * scheme which has much lower impact on system performance.  Note
+ * that the main rationale for the checksum is to match integrity
+ * metadata with data.  Detecting bit errors are a job for ECC memory
+ * and buses.
+ */
+
+enum scsi_host_guard_type {
+        SHOST_DIX_GUARD_CRC = 1 << 0,
+        SHOST_DIX_GUARD_IP  = 1 << 1,
+};
+
+static inline void scsi_host_set_guard(struct Scsi_Host *shost, unsigned char type)
+{
+        shost->prot_guard_type = type;
+}
+
+static inline unsigned char scsi_host_get_guard(struct Scsi_Host *shost)
+{
+        return shost->prot_guard_type;
+}
+
 /* legacy interfaces */
 extern struct Scsi_Host *scsi_register(struct scsi_host_template *, int);
 extern void scsi_unregister(struct Scsi_Host *);
diff --git a/init/Kconfig b/init/Kconfig
index a50bdfed2df7..250e02c8f8f9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3
           process and it's parent. Note that this file format is incompatible
           with previous v0/v1/v2 file formats, so you will need updated tools
           for processing it. A preliminary version of these tools is available
-          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
+          at <http://www.gnu.org/software/acct/>.
 
 config TASKSTATS
         bool "Export task/process statistics through netlink (EXPERIMENTAL)"
@@ -486,7 +486,7 @@ config PID_NS
         default n
         depends on NAMESPACES && EXPERIMENTAL
         help
-          Suport process id namespaces.  This allows having multiple
+          Support process id namespaces.  This allows having multiple
           process with the same pid as long as they are in different
           pid namespaces.  This is a building block of containers.
 
@@ -802,6 +802,10 @@ config PROC_PAGE_MONITOR
 
 endmenu         # General setup
 
+config HAVE_GENERIC_DMA_COHERENT
+        bool
+        default n
+
 config SLABINFO
         bool
         depends on PROC_FS
diff --git a/kernel/Makefile b/kernel/Makefile
index 54f69837d35a..4e1d7df7c3e2 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -84,6 +84,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
 obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 obj-$(CONFIG_MARKERS) += marker.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
+obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_FTRACE) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 10ba5f1004a5..e202a68d1cc1 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -216,7 +216,6 @@ static int __ref take_cpu_down(void *_param)
 static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 {
         int err, nr_calls = 0;
-        struct task_struct *p;
         cpumask_t old_allowed, tmp;
         void *hcpu = (void *)(long)cpu;
         unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
@@ -249,21 +248,18 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
         cpus_setall(tmp);
         cpu_clear(cpu, tmp);
         set_cpus_allowed_ptr(current, &tmp);
+        tmp = cpumask_of_cpu(cpu);
 
-        p = __stop_machine_run(take_cpu_down, &tcd_param, cpu);
-
-        if (IS_ERR(p) || cpu_online(cpu)) {
+        err = __stop_machine(take_cpu_down, &tcd_param, &tmp);
+        if (err) {
                 /* CPU didn't die: tell everyone.  Can't complain. */
                 if (raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod,
                                             hcpu) == NOTIFY_BAD)
                         BUG();
 
-                if (IS_ERR(p)) {
-                        err = PTR_ERR(p);
-                        goto out_allowed;
-                }
-                goto out_thread;
+                goto out_allowed;
         }
+        BUG_ON(cpu_online(cpu));
 
         /* Wait for it to sleep (leaving idle task). */
         while (!idle_cpu(cpu))
@@ -279,8 +275,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 
         check_for_tasks(cpu);
 
-out_thread:
-        err = kthread_stop(p);
 out_allowed:
         set_cpus_allowed_ptr(current, &old_allowed);
 out_release:
@@ -461,3 +455,28 @@ out:
 #endif /* CONFIG_PM_SLEEP_SMP */
 
 #endif /* CONFIG_SMP */
+
+/*
+ * cpu_bit_bitmap[] is a special, "compressed" data structure that
+ * represents all NR_CPUS bits binary values of 1<<nr.
+ *
+ * It is used by cpumask_of_cpu() to get a constant address to a CPU
+ * mask value that has a single bit set only.
+ */
+
+/* cpu_bit_bitmap[0] is empty - so we can back into it */
+#define MASK_DECLARE_1(x)       [x+1][0] = 1UL << (x)
+#define MASK_DECLARE_2(x)       MASK_DECLARE_1(x), MASK_DECLARE_1(x+1)
+#define MASK_DECLARE_4(x)       MASK_DECLARE_2(x), MASK_DECLARE_2(x+2)
+#define MASK_DECLARE_8(x)       MASK_DECLARE_4(x), MASK_DECLARE_4(x+4)
+
+const unsigned long cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)] = {
+
+        MASK_DECLARE_8(0),      MASK_DECLARE_8(8),
+        MASK_DECLARE_8(16),     MASK_DECLARE_8(24),
+#if BITS_PER_LONG > 32
+        MASK_DECLARE_8(32),     MASK_DECLARE_8(40),
+        MASK_DECLARE_8(48),     MASK_DECLARE_8(56),
+#endif
+};
+EXPORT_SYMBOL_GPL(cpu_bit_bitmap);
diff --git a/kernel/dma-coherent.c b/kernel/dma-coherent.c
new file mode 100644
index 000000000000..7517115a8cce
--- /dev/null
+++ b/kernel/dma-coherent.c
@@ -0,0 +1,154 @@
+/*
+ * Coherent per-device memory handling.
+ * Borrowed from i386
+ */
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+
+struct dma_coherent_mem {
+        void            *virt_base;
+        u32             device_base;
+        int             size;
+        int             flags;
+        unsigned long   *bitmap;
+};
+
+int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
+                                dma_addr_t device_addr, size_t size, int flags)
+{
+        void __iomem *mem_base = NULL;
+        int pages = size >> PAGE_SHIFT;
+        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
+
+        if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
+                goto out;
+        if (!size)
+                goto out;
+        if (dev->dma_mem)
+                goto out;
+
+        /* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
+
+        mem_base = ioremap(bus_addr, size);
+        if (!mem_base)
+                goto out;
+
+        dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
+        if (!dev->dma_mem)
+                goto out;
+        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
+        if (!dev->dma_mem->bitmap)
+                goto free1_out;
+
+        dev->dma_mem->virt_base = mem_base;
+        dev->dma_mem->device_base = device_addr;
+        dev->dma_mem->size = pages;
+        dev->dma_mem->flags = flags;
+
+        if (flags & DMA_MEMORY_MAP)
+                return DMA_MEMORY_MAP;
+
+        return DMA_MEMORY_IO;
+
+ free1_out:
+        kfree(dev->dma_mem);
+ out:
+        if (mem_base)
+                iounmap(mem_base);
+        return 0;
+}
+EXPORT_SYMBOL(dma_declare_coherent_memory);
+
+void dma_release_declared_memory(struct device *dev)
+{
+        struct dma_coherent_mem *mem = dev->dma_mem;
+
+        if (!mem)
+                return;
+        dev->dma_mem = NULL;
+        iounmap(mem->virt_base);
+        kfree(mem->bitmap);
+        kfree(mem);
+}
+EXPORT_SYMBOL(dma_release_declared_memory);
+
+void *dma_mark_declared_memory_occupied(struct device *dev,
+                                        dma_addr_t device_addr, size_t size)
+{
+        struct dma_coherent_mem *mem = dev->dma_mem;
+        int pos, err;
+        int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1);
+
+        pages >>= PAGE_SHIFT;
+
+        if (!mem)
+                return ERR_PTR(-EINVAL);
+
+        pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
+        err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
+        if (err != 0)
+                return ERR_PTR(err);
+        return mem->virt_base + (pos << PAGE_SHIFT);
+}
+EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
+
+/**
+ * Try to allocate memory from the per-device coherent area.
+ *
+ * @dev:        device from which we allocate memory
+ * @size:       size of requested memory area
+ * @dma_handle: This will be filled with the correct dma handle
+ * @ret:        This pointer will be filled with the virtual address
+ *              to allocated area.
+ *
+ * This function should be only called from per-arch %dma_alloc_coherent()
+ * to support allocation from per-device coherent memory pools.
+ *
+ * Returns 0 if dma_alloc_coherent should continue with allocating from
+ * generic memory areas, or !0 if dma_alloc_coherent should return %ret.
+ */
+int dma_alloc_from_coherent(struct device *dev, ssize_t size,
+                                       dma_addr_t *dma_handle, void **ret)
+{
+        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
+        int order = get_order(size);
+
+        if (mem) {
+                int page = bitmap_find_free_region(mem->bitmap, mem->size,
+                                                     order);
+                if (page >= 0) {
+                        *dma_handle = mem->device_base + (page << PAGE_SHIFT);
+                        *ret = mem->virt_base + (page << PAGE_SHIFT);
+                        memset(*ret, 0, size);
+                } else if (mem->flags & DMA_MEMORY_EXCLUSIVE)
+                        *ret = NULL;
+        }
+        return (mem != NULL);
+}
+
+/**
+ * Try to free the memory allocated from per-device coherent memory pool.
+ * @dev:        device from which the memory was allocated
+ * @order:      the order of pages allocated
+ * @vaddr:      virtual address of allocated pages
+ *
+ * This checks whether the memory was allocated from the per-device
+ * coherent memory pool and if so, releases that memory.
+ *
+ * Returns 1 if we correctly released the memory, or 0 if
+ * %dma_release_coherent() should proceed with releasing memory from
+ * generic pools.
+ */
+int dma_release_from_coherent(struct device *dev, int order, void *vaddr)
+{
+        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
+
+        if (mem && vaddr >= mem->virt_base && vaddr <
+                   (mem->virt_base + (mem->size << PAGE_SHIFT))) {
+                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
+
+                bitmap_release_region(mem->bitmap, page, order);
+                return 1;
+        }
+        return 0;
+}
diff --git a/kernel/exit.c b/kernel/exit.c
index 0caf590548a0..eb4d6470d1d0 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -121,18 +121,7 @@ static void __exit_signal(struct task_struct *tsk)
                 sig->nivcsw += tsk->nivcsw;
                 sig->inblock += task_io_get_inblock(tsk);
                 sig->oublock += task_io_get_oublock(tsk);
-#ifdef CONFIG_TASK_XACCT
-                sig->rchar += tsk->rchar;
-                sig->wchar += tsk->wchar;
-                sig->syscr += tsk->syscr;
-                sig->syscw += tsk->syscw;
-#endif /* CONFIG_TASK_XACCT */
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-                sig->ioac.read_bytes += tsk->ioac.read_bytes;
-                sig->ioac.write_bytes += tsk->ioac.write_bytes;
-                sig->ioac.cancelled_write_bytes +=
-                                        tsk->ioac.cancelled_write_bytes;
-#endif /* CONFIG_TASK_IO_ACCOUNTING */
+                task_io_accounting_add(&sig->ioac, &tsk->ioac);
                 sig->sum_sched_runtime += tsk->se.sum_exec_runtime;
                 sig = NULL; /* Marker for below. */
         }
@@ -1363,21 +1352,8 @@ static int wait_task_zombie(struct task_struct *p, int options,
                 psig->coublock +=
                         task_io_get_oublock(p) +
                         sig->oublock + sig->coublock;
-#ifdef CONFIG_TASK_XACCT
-                psig->rchar += p->rchar + sig->rchar;
-                psig->wchar += p->wchar + sig->wchar;
-                psig->syscr += p->syscr + sig->syscr;
-                psig->syscw += p->syscw + sig->syscw;
-#endif /* CONFIG_TASK_XACCT */
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-                psig->ioac.read_bytes +=
-                        p->ioac.read_bytes + sig->ioac.read_bytes;
-                psig->ioac.write_bytes +=
-                        p->ioac.write_bytes + sig->ioac.write_bytes;
-                psig->ioac.cancelled_write_bytes +=
-                                p->ioac.cancelled_write_bytes +
-                                sig->ioac.cancelled_write_bytes;
-#endif /* CONFIG_TASK_IO_ACCOUNTING */
+                task_io_accounting_add(&psig->ioac, &p->ioac);
+                task_io_accounting_add(&psig->ioac, &sig->ioac);
                 spin_unlock_irq(&p->parent->sighand->siglock);
         }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 5e050c1317c4..7ce2ebe84796 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -27,6 +27,7 @@
 #include <linux/key.h>
 #include <linux/binfmts.h>
 #include <linux/mman.h>
+#include <linux/mmu_notifier.h>
 #include <linux/fs.h>
 #include <linux/nsproxy.h>
 #include <linux/capability.h>
@@ -414,6 +415,7 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
 
         if (likely(!mm_alloc_pgd(mm))) {
                 mm->def_flags = 0;
+                mmu_notifier_mm_init(mm);
                 return mm;
         }
 
@@ -446,6 +448,7 @@ void __mmdrop(struct mm_struct *mm)
         BUG_ON(mm == &init_mm);
         mm_free_pgd(mm);
         destroy_context(mm);
+        mmu_notifier_mm_destroy(mm);
         free_mm(mm);
 }
 EXPORT_SYMBOL_GPL(__mmdrop);
@@ -806,12 +809,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
         sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;
         sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;
         sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;
-#ifdef CONFIG_TASK_XACCT
-        sig->rchar = sig->wchar = sig->syscr = sig->syscw = 0;
-#endif
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-        memset(&sig->ioac, 0, sizeof(sig->ioac));
-#endif
+        task_io_accounting_init(&sig->ioac);
         sig->sum_sched_runtime = 0;
         INIT_LIST_HEAD(&sig->cpu_timers[0]);
         INIT_LIST_HEAD(&sig->cpu_timers[1]);
@@ -994,13 +992,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->last_switch_timestamp = 0;
 #endif
 
-#ifdef CONFIG_TASK_XACCT
-        p->rchar = 0;           /* I/O counter: bytes read */
-        p->wchar = 0;           /* I/O counter: bytes written */
-        p->syscr = 0;           /* I/O counter: read syscalls */
-        p->syscw = 0;           /* I/O counter: write syscalls */
-#endif
-        task_io_accounting_init(p);
+        task_io_accounting_init(&p->ioac);
         acct_clear_integrals(p);
 
         p->it_virt_expires = cputime_zero;
diff --git a/kernel/module.c b/kernel/module.c
index d8b5605132a0..61d212120df4 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -325,18 +325,6 @@ static unsigned long find_symbol(const char *name,
         return -ENOENT;
 }
 
-/* lookup symbol in given range of kernel_symbols */
-static const struct kernel_symbol *lookup_symbol(const char *name,
-        const struct kernel_symbol *start,
-        const struct kernel_symbol *stop)
-{
-        const struct kernel_symbol *ks = start;
-        for (; ks < stop; ks++)
-                if (strcmp(ks->name, name) == 0)
-                        return ks;
-        return NULL;
-}
-
 /* Search for module by name: must hold module_mutex. */
 static struct module *find_module(const char *name)
 {
@@ -690,7 +678,7 @@ static int try_stop_module(struct module *mod, int flags, int *forced)
         if (flags & O_NONBLOCK) {
                 struct stopref sref = { mod, flags, forced };
 
-                return stop_machine_run(__try_stop_module, &sref, NR_CPUS);
+                return stop_machine(__try_stop_module, &sref, NULL);
         } else {
                 /* We don't need to stop the machine for this. */
                 mod->state = MODULE_STATE_GOING;
@@ -1428,7 +1416,7 @@ static int __unlink_module(void *_mod)
 static void free_module(struct module *mod)
 {
         /* Delete from various lists */
-        stop_machine_run(__unlink_module, mod, NR_CPUS);
+        stop_machine(__unlink_module, mod, NULL);
         remove_notes_attrs(mod);
         remove_sect_attrs(mod);
         mod_kobject_remove(mod);
@@ -1703,6 +1691,19 @@ static void setup_modinfo(struct module *mod, Elf_Shdr *sechdrs,
 }
 
 #ifdef CONFIG_KALLSYMS
+
+/* lookup symbol in given range of kernel_symbols */
+static const struct kernel_symbol *lookup_symbol(const char *name,
+        const struct kernel_symbol *start,
+        const struct kernel_symbol *stop)
+{
+        const struct kernel_symbol *ks = start;
+        for (; ks < stop; ks++)
+                if (strcmp(ks->name, name) == 0)
+                        return ks;
+        return NULL;
+}
+
 static int is_exported(const char *name, const struct module *mod)
 {
         if (!mod && lookup_symbol(name, __start___ksymtab, __stop___ksymtab))
@@ -2196,7 +2197,7 @@ static struct module *load_module(void __user *umod,
         /* Now sew it into the lists so we can get lockdep and oops
          * info during argument parsing.  Noone should access us, since
          * strong_try_module_get() will fail. */
-        stop_machine_run(__link_module, mod, NR_CPUS);
+        stop_machine(__link_module, mod, NULL);
 
         /* Size of section 0 is 0, so this works well if no params */
         err = parse_args(mod->name, mod->args,
@@ -2230,7 +2231,7 @@ static struct module *load_module(void __user *umod,
         return mod;
 
  unlink:
-        stop_machine_run(__unlink_module, mod, NR_CPUS);
+        stop_machine(__unlink_module, mod, NULL);
         module_arch_cleanup(mod);
  cleanup:
         kobject_del(&mod->mkobj.kobj);
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
index 6f8696c502f4..aad93cdc9f68 100644
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
@@ -91,8 +91,8 @@ static void force_quiescent_state(struct rcu_data *rdp,
                  * rdp->cpu is the current cpu.
                  *
                  * cpu_online_map is updated by the _cpu_down()
-                 * using stop_machine_run(). Since we're in irqs disabled
-                 * section, stop_machine_run() is not exectuting, hence
+                 * using __stop_machine(). Since we're in irqs disabled
+                 * section, __stop_machine() is not exectuting, hence
                  * the cpu_online_map is stable.
                  *
                  * However,  a cpu might have been offlined _just_ before
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 738b411ff2d3..e446c7c7d6a9 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -1,4 +1,4 @@
-/* Copyright 2005 Rusty Russell rusty@rustcorp.com.au IBM Corporation.
+/* Copyright 2008, 2005 Rusty Russell rusty@rustcorp.com.au IBM Corporation.
  * GPL v2 and any later version.
  */
 #include <linux/cpu.h>
@@ -13,204 +13,178 @@
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 
-/* Since we effect priority and affinity (both of which are visible
- * to, and settable by outside processes) we do indirection via a
- * kthread. */
-
-/* Thread to stop each CPU in user context. */
+/* This controls the threads on each CPU. */
 enum stopmachine_state {
-        STOPMACHINE_WAIT,
+        /* Dummy starting state for thread. */
+        STOPMACHINE_NONE,
+        /* Awaiting everyone to be scheduled. */
         STOPMACHINE_PREPARE,
+        /* Disable interrupts. */
         STOPMACHINE_DISABLE_IRQ,
+        /* Run the function */
+        STOPMACHINE_RUN,
+        /* Exit */
         STOPMACHINE_EXIT,
 };
+static enum stopmachine_state state;
 
-static enum stopmachine_state stopmachine_state;
-static unsigned int stopmachine_num_threads;
-static atomic_t stopmachine_thread_ack;
-
-static int stopmachine(void *cpu)
-{
-        int irqs_disabled = 0;
-        int prepared = 0;
-        cpumask_of_cpu_ptr(cpumask, (int)(long)cpu);
-
-        set_cpus_allowed_ptr(current, cpumask);
-
-        /* Ack: we are alive */
-        smp_mb(); /* Theoretically the ack = 0 might not be on this CPU yet. */
-        atomic_inc(&stopmachine_thread_ack);
-
-        /* Simple state machine */
-        while (stopmachine_state != STOPMACHINE_EXIT) {
-                if (stopmachine_state == STOPMACHINE_DISABLE_IRQ 
-                    && !irqs_disabled) {
-                        local_irq_disable();
-                        hard_irq_disable();
-                        irqs_disabled = 1;
-                        /* Ack: irqs disabled. */
-                        smp_mb(); /* Must read state first. */
-                        atomic_inc(&stopmachine_thread_ack);
-                } else if (stopmachine_state == STOPMACHINE_PREPARE
-                           && !prepared) {
-                        /* Everyone is in place, hold CPU. */
-                        preempt_disable();
-                        prepared = 1;
-                        smp_mb(); /* Must read state first. */
-                        atomic_inc(&stopmachine_thread_ack);
-                }
-                /* Yield in first stage: migration threads need to
-                 * help our sisters onto their CPUs. */
-                if (!prepared && !irqs_disabled)
-                        yield();
-                cpu_relax();
-        }
-
-        /* Ack: we are exiting. */
-        smp_mb(); /* Must read state first. */
-        atomic_inc(&stopmachine_thread_ack);
-
-        if (irqs_disabled)
-                local_irq_enable();
-        if (prepared)
-                preempt_enable();
+struct stop_machine_data {
+        int (*fn)(void *);
+        void *data;
+        int fnret;
+};
 
-        return 0;
-}
+/* Like num_online_cpus(), but hotplug cpu uses us, so we need this. */
+static unsigned int num_threads;
+static atomic_t thread_ack;
+static struct completion finished;
+static DEFINE_MUTEX(lock);
 
-/* Change the thread state */
-static void stopmachine_set_state(enum stopmachine_state state)
+static void set_state(enum stopmachine_state newstate)
 {
-        atomic_set(&stopmachine_thread_ack, 0);
+        /* Reset ack counter. */
+        atomic_set(&thread_ack, num_threads);
         smp_wmb();
-        stopmachine_state = state;
-        while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads)
-                cpu_relax();
+        state = newstate;
 }
 
-static int stop_machine(void)
+/* Last one to ack a state moves to the next state. */
+static void ack_state(void)
 {
-        int i, ret = 0;
-
-        atomic_set(&stopmachine_thread_ack, 0);
-        stopmachine_num_threads = 0;
-        stopmachine_state = STOPMACHINE_WAIT;
-
-        for_each_online_cpu(i) {
-                if (i == raw_smp_processor_id())
-                        continue;
-                ret = kernel_thread(stopmachine, (void *)(long)i,CLONE_KERNEL);
-                if (ret < 0)
-                        break;
-                stopmachine_num_threads++;
-        }
-
-        /* Wait for them all to come to life. */
-        while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) {
-                yield();
-                cpu_relax();
+        if (atomic_dec_and_test(&thread_ack)) {
+                /* If we're the last one to ack the EXIT, we're finished. */
+                if (state == STOPMACHINE_EXIT)
+                        complete(&finished);
+                else
+                        set_state(state + 1);
         }
+}
 
-        /* If some failed, kill them all. */
-        if (ret < 0) {
-                stopmachine_set_state(STOPMACHINE_EXIT);
-                return ret;
-        }
+/* This is the actual thread which stops the CPU.  It exits by itself rather
+ * than waiting for kthread_stop(), because it's easier for hotplug CPU. */
+static int stop_cpu(struct stop_machine_data *smdata)
+{
+        enum stopmachine_state curstate = STOPMACHINE_NONE;
+        int uninitialized_var(ret);
 
-        /* Now they are all started, make them hold the CPUs, ready. */
-        preempt_disable();
-        stopmachine_set_state(STOPMACHINE_PREPARE);
+        /* Simple state machine */
+        do {
+                /* Chill out and ensure we re-read stopmachine_state. */
+                cpu_relax();
+                if (state != curstate) {
+                        curstate = state;
+                        switch (curstate) {
+                        case STOPMACHINE_DISABLE_IRQ:
+                                local_irq_disable();
+                                hard_irq_disable();
+                                break;
+                        case STOPMACHINE_RUN:
+                                /* |= allows error detection if functions on
+                                 * multiple CPUs. */
+                                smdata->fnret |= smdata->fn(smdata->data);
+                                break;
+                        default:
+                                break;
+                        }
+                        ack_state();
+                }
+        } while (curstate != STOPMACHINE_EXIT);
 
-        /* Make them disable irqs. */
-        local_irq_disable();
-        hard_irq_disable();
-        stopmachine_set_state(STOPMACHINE_DISABLE_IRQ);
+        local_irq_enable();
+        do_exit(0);
+}
 
+/* Callback for CPUs which aren't supposed to do anything. */
+static int chill(void *unused)
+{
         return 0;
 }
 
-static void restart_machine(void)
+int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus)
 {
-        stopmachine_set_state(STOPMACHINE_EXIT);
-        local_irq_enable();
-        preempt_enable_no_resched();
-}
+        int i, err;
+        struct stop_machine_data active, idle;
+        struct task_struct **threads;
+
+        active.fn = fn;
+        active.data = data;
+        active.fnret = 0;
+        idle.fn = chill;
+        idle.data = NULL;
+
+        /* This could be too big for stack on large machines. */
+        threads = kcalloc(NR_CPUS, sizeof(threads[0]), GFP_KERNEL);
+        if (!threads)
+                return -ENOMEM;
+
+        /* Set up initial state. */
+        mutex_lock(&lock);
+        init_completion(&finished);
+        num_threads = num_online_cpus();
+        set_state(STOPMACHINE_PREPARE);
 
-struct stop_machine_data {
-        int (*fn)(void *);
-        void *data;
-        struct completion done;
-};
+        for_each_online_cpu(i) {
+                struct stop_machine_data *smdata = &idle;
+                struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
 
-static int do_stop(void *_smdata)
-{
-        struct stop_machine_data *smdata = _smdata;
-        int ret;
+                if (!cpus) {
+                        if (i == first_cpu(cpu_online_map))
+                                smdata = &active;
+                } else {
+                        if (cpu_isset(i, *cpus))
+                                smdata = &active;
+                }
 
-        ret = stop_machine();
-        if (ret == 0) {
-                ret = smdata->fn(smdata->data);
-                restart_machine();
-        }
+                threads[i] = kthread_create((void *)stop_cpu, smdata, "kstop%u",
+                                            i);
+                if (IS_ERR(threads[i])) {
+                        err = PTR_ERR(threads[i]);
+                        threads[i] = NULL;
+                        goto kill_threads;
+                }
 
-        /* We're done: you can kthread_stop us now */
-        complete(&smdata->done);
+                /* Place it onto correct cpu. */
+                kthread_bind(threads[i], i);
 
-        /* Wait for kthread_stop */
-        set_current_state(TASK_INTERRUPTIBLE);
-        while (!kthread_should_stop()) {
-                schedule();
-                set_current_state(TASK_INTERRUPTIBLE);
+                /* Make it highest prio. */
+                if (sched_setscheduler_nocheck(threads[i], SCHED_FIFO, &param))
+                        BUG();
         }
-        __set_current_state(TASK_RUNNING);
-        return ret;
-}
 
-struct task_struct *__stop_machine_run(int (*fn)(void *), void *data,
-                                       unsigned int cpu)
-{
-        static DEFINE_MUTEX(stopmachine_mutex);
-        struct stop_machine_data smdata;
-        struct task_struct *p;
+        /* We've created all the threads.  Wake them all: hold this CPU so one
+         * doesn't hit this CPU until we're ready. */
+        get_cpu();
+        for_each_online_cpu(i)
+                wake_up_process(threads[i]);
 
-        smdata.fn = fn;
-        smdata.data = data;
-        init_completion(&smdata.done);
+        /* This will release the thread on our CPU. */
+        put_cpu();
+        wait_for_completion(&finished);
+        mutex_unlock(&lock);
 
-        mutex_lock(&stopmachine_mutex);
+        kfree(threads);
 
-        /* If they don't care which CPU fn runs on, bind to any online one. */
-        if (cpu == NR_CPUS)
-                cpu = raw_smp_processor_id();
+        return active.fnret;
 
-        p = kthread_create(do_stop, &smdata, "kstopmachine");
-        if (!IS_ERR(p)) {
-                struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
+kill_threads:
+        for_each_online_cpu(i)
+                if (threads[i])
+                        kthread_stop(threads[i]);
+        mutex_unlock(&lock);
 
-                /* One high-prio thread per cpu.  We'll do this one. */
-                sched_setscheduler_nocheck(p, SCHED_FIFO, &param);
-                kthread_bind(p, cpu);
-                wake_up_process(p);
-                wait_for_completion(&smdata.done);
-        }
-        mutex_unlock(&stopmachine_mutex);
-        return p;
+        kfree(threads);
+        return err;
 }
 
-int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
+int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus)
 {
-        struct task_struct *p;
         int ret;
 
         /* No CPUs can come up or down during this. */
         get_online_cpus();
-        p = __stop_machine_run(fn, data, cpu);
-        if (!IS_ERR(p))
-                ret = kthread_stop(p);
-        else
-                ret = PTR_ERR(p);
+        ret = __stop_machine(fn, data, cpus);
         put_online_cpus();
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(stop_machine_run);
+EXPORT_SYMBOL_GPL(stop_machine);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 911d846f0503..fe4713347275 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1680,43 +1680,45 @@ static __init int sysctl_init(void)
 
 core_initcall(sysctl_init);
 
-static int is_branch_in(struct ctl_table *branch, struct ctl_table *table)
+static struct ctl_table *is_branch_in(struct ctl_table *branch,
+                                      struct ctl_table *table)
 {
         struct ctl_table *p;
         const char *s = branch->procname;
 
         /* branch should have named subdirectory as its first element */
         if (!s || !branch->child)
-                return 0;
+                return NULL;
 
         /* ... and nothing else */
         if (branch[1].procname || branch[1].ctl_name)
-                return 0;
+                return NULL;
 
         /* table should contain subdirectory with the same name */
         for (p = table; p->procname || p->ctl_name; p++) {
                 if (!p->child)
                         continue;
                 if (p->procname && strcmp(p->procname, s) == 0)
-                        return 1;
+                        return p;
         }
-        return 0;
+        return NULL;
 }
 
 /* see if attaching q to p would be an improvement */
 static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q)
 {
         struct ctl_table *to = p->ctl_table, *by = q->ctl_table;
+        struct ctl_table *next;
         int is_better = 0;
         int not_in_parent = !p->attached_by;
 
-        while (is_branch_in(by, to)) {
+        while ((next = is_branch_in(by, to)) != NULL) {
                 if (by == q->attached_by)
                         is_better = 1;
                 if (to == p->attached_by)
                         not_in_parent = 1;
                 by = by->child;
-                to = to->child;
+                to = next->child;
         }
 
         if (is_better && not_in_parent) {
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index bf43284d6855..80c4336f4188 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -196,12 +196,10 @@ static int tick_check_new_device(struct clock_event_device *newdev)
         struct tick_device *td;
         int cpu, ret = NOTIFY_OK;
         unsigned long flags;
-        cpumask_of_cpu_ptr_declare(cpumask);
 
         spin_lock_irqsave(&tick_device_lock, flags);
 
         cpu = smp_processor_id();
-        cpumask_of_cpu_ptr_next(cpumask, cpu);
         if (!cpu_isset(cpu, newdev->cpumask))
                 goto out_bc;
 
@@ -209,7 +207,7 @@ static int tick_check_new_device(struct clock_event_device *newdev)
         curdev = td->evtdev;
 
         /* cpu local device ? */
-        if (!cpus_equal(newdev->cpumask, *cpumask)) {
+        if (!cpus_equal(newdev->cpumask, cpumask_of_cpu(cpu))) {
 
                 /*
                  * If the cpu affinity of the device interrupt can not
@@ -222,7 +220,7 @@ static int tick_check_new_device(struct clock_event_device *newdev)
                  * If we have a cpu local device already, do not replace it
                  * by a non cpu local device
                  */
-                if (curdev && cpus_equal(curdev->cpumask, *cpumask))
+                if (curdev && cpus_equal(curdev->cpumask, cpumask_of_cpu(cpu)))
                         goto out_bc;
         }
 
@@ -254,7 +252,7 @@ static int tick_check_new_device(struct clock_event_device *newdev)
                 curdev = NULL;
         }
         clockevents_exchange_device(curdev, newdev);
-        tick_setup_device(td, newdev, cpu, cpumask);
+        tick_setup_device(td, newdev, cpu, &cpumask_of_cpu(cpu));
         if (newdev->features & CLOCK_EVT_FEAT_ONESHOT)
                 tick_oneshot_notify();
 
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 4231a3dc224a..f6e3af31b403 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -587,7 +587,7 @@ static int __ftrace_modify_code(void *data)
 
 static void ftrace_run_update_code(int command)
 {
-        stop_machine_run(__ftrace_modify_code, &command, NR_CPUS);
+        stop_machine(__ftrace_modify_code, &command, NULL);
 }
 
 void ftrace_disable_daemon(void)
@@ -787,7 +787,7 @@ static int ftrace_update_code(void)
             !ftrace_enabled || !ftraced_trigger)
                 return 0;
 
-        stop_machine_run(__ftrace_update_code, NULL, NR_CPUS);
+        stop_machine(__ftrace_update_code, NULL, NULL);
 
         return 1;
 }
@@ -1564,7 +1564,7 @@ static int __init ftrace_dynamic_init(void)
 
         addr = (unsigned long)ftrace_record_ip;
 
-        stop_machine_run(ftrace_dyn_arch_init, &addr, NR_CPUS);
+        stop_machine(ftrace_dyn_arch_init, &addr, NULL);
 
         /* ftrace_dyn_arch_init places the return code in addr */
         if (addr) {
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index fc20e09a6cb1..8f3fb3db61c3 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1183,7 +1183,6 @@ static void *find_next_entry_inc(struct trace_iterator *iter)
 static void *s_next(struct seq_file *m, void *v, loff_t *pos)
 {
         struct trace_iterator *iter = m->private;
-        void *last_ent = iter->ent;
         int i = (int)*pos;
         void *ent;
 
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c
index ce2d723c10e1..bb948e52ce20 100644
--- a/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c
@@ -213,9 +213,7 @@ static void start_stack_timers(void)
         int cpu;
 
         for_each_online_cpu(cpu) {
-                cpumask_of_cpu_ptr(new_mask, cpu);
-
-                set_cpus_allowed_ptr(current, new_mask);
+                set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
                 start_stack_timer(cpu);
         }
         set_cpus_allowed_ptr(current, &saved_mask);
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 3da47ccdc5e5..8ebcd8532dfb 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -94,10 +94,10 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
                 stats->hiwater_vm    = mm->hiwater_vm * PAGE_SIZE / KB;
                 mmput(mm);
         }
-        stats->read_char        = p->rchar;
-        stats->write_char       = p->wchar;
-        stats->read_syscalls    = p->syscr;
-        stats->write_syscalls   = p->syscw;
+        stats->read_char        = p->ioac.rchar;
+        stats->write_char       = p->ioac.wchar;
+        stats->read_syscalls    = p->ioac.syscr;
+        stats->write_syscalls   = p->ioac.syscw;
 #ifdef CONFIG_TASK_IO_ACCOUNTING
         stats->read_bytes       = p->ioac.read_bytes;
         stats->write_bytes      = p->ioac.write_bytes;
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c
index a3b8d4c3f77a..889ddce2021e 100644
--- a/lib/iommu-helper.c
+++ b/lib/iommu-helper.c
@@ -80,3 +80,11 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
         }
 }
 EXPORT_SYMBOL(iommu_area_free);
+
+unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
+{
+        unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
+
+        return size >> PAGE_SHIFT;
+}
+EXPORT_SYMBOL(iommu_num_pages);
diff --git a/lib/ratelimit.c b/lib/ratelimit.c
index 35136671b215..26187edcc7ea 100644
--- a/lib/ratelimit.c
+++ b/lib/ratelimit.c
@@ -15,7 +15,6 @@
 #include <linux/module.h>
 
 static DEFINE_SPINLOCK(ratelimit_lock);
-static unsigned long flags;
 
 /*
  * __ratelimit - rate limiting
@@ -26,6 +25,8 @@ static unsigned long flags;
  */
 int __ratelimit(struct ratelimit_state *rs)
 {
+        unsigned long flags;
+
         if (!rs->interval)
                 return 1;
 
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index c4381d9516f6..0f8fc22ed103 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -11,7 +11,6 @@ notrace unsigned int debug_smp_processor_id(void)
 {
         unsigned long preempt_count = preempt_count();
         int this_cpu = raw_smp_processor_id();
-        cpumask_of_cpu_ptr_declare(this_mask);
 
         if (likely(preempt_count))
                 goto out;
@@ -23,9 +22,7 @@ notrace unsigned int debug_smp_processor_id(void)
          * Kernel threads bound to a single CPU can safely use
          * smp_processor_id():
          */
-        cpumask_of_cpu_ptr_next(this_mask, this_cpu);
-
-        if (cpus_equal(current->cpus_allowed, *this_mask))
+        if (cpus_equal(current->cpus_allowed, cpumask_of_cpu(this_cpu)))
                 goto out;
 
         /*
diff --git a/mm/Kconfig b/mm/Kconfig
index efee5d379df4..446c6588c753 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -208,3 +208,6 @@ config NR_QUICK
 config VIRT_TO_BUS
         def_bool y
         depends on !ARCH_NO_VIRT_TO_BUS
+
+config MMU_NOTIFIER
+        bool
diff --git a/mm/Makefile b/mm/Makefile
index 06ca2381fef1..da4ccf015aea 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_SHMEM) += shmem.o
 obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o
 obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
 obj-$(CONFIG_SLOB) += slob.o
+obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
 obj-$(CONFIG_SLAB) += slab.o
 obj-$(CONFIG_SLUB) += slub.o
 obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
diff --git a/mm/filemap.c b/mm/filemap.c
index 5de7633e1dbe..42bbc6909ba4 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1023,8 +1023,17 @@ find_page:
                                         ra, filp, page,
                                         index, last_index - index);
                 }
-                if (!PageUptodate(page))
-                        goto page_not_up_to_date;
+                if (!PageUptodate(page)) {
+                        if (inode->i_blkbits == PAGE_CACHE_SHIFT ||
+                                        !mapping->a_ops->is_partially_uptodate)
+                                goto page_not_up_to_date;
+                        if (TestSetPageLocked(page))
+                                goto page_not_up_to_date;
+                        if (!mapping->a_ops->is_partially_uptodate(page,
+                                                                desc, offset))
+                                goto page_not_up_to_date_locked;
+                        unlock_page(page);
+                }
 page_ok:
                 /*
                  * i_size must be checked after we know the page is Uptodate.
@@ -1094,6 +1103,7 @@ page_not_up_to_date:
                 if (lock_page_killable(page))
                         goto readpage_eio;
 
+page_not_up_to_date_locked:
                 /* Did it get truncated before we got the lock? */
                 if (!page->mapping) {
                         unlock_page(page);
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 98a3f31ccd6a..380ab402d711 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/rmap.h>
+#include <linux/mmu_notifier.h>
 #include <linux/sched.h>
 #include <asm/tlbflush.h>
 #include <asm/io.h>
@@ -188,7 +189,7 @@ __xip_unmap (struct address_space * mapping,
                 if (pte) {
                         /* Nuke the page table entry. */
                         flush_cache_page(vma, address, pte_pfn(*pte));
-                        pteval = ptep_clear_flush(vma, address, pte);
+                        pteval = ptep_clear_flush_notify(vma, address, pte);
                         page_remove_rmap(page, vma);
                         dec_mm_counter(mm, file_rss);
                         BUG_ON(pte_dirty(pteval));
diff --git a/mm/fremap.c b/mm/fremap.c
index 07a9c82ce1a3..7881638e4a12 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -15,6 +15,7 @@
 #include <linux/rmap.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/mmu_notifier.h>
 
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
@@ -214,7 +215,9 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                 spin_unlock(&mapping->i_mmap_lock);
         }
 
+        mmu_notifier_invalidate_range_start(mm, start, start + size);
         err = populate_range(mm, vma, start, size, pgoff);
+        mmu_notifier_invalidate_range_end(mm, start, start + size);
         if (!err && !(flags & MAP_NONBLOCK)) {
                 if (unlikely(has_write_lock)) {
                         downgrade_write(&mm->mmap_sem);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3be79dc18c5c..254ce2b90158 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 #include <linux/highmem.h>
+#include <linux/mmu_notifier.h>
 #include <linux/nodemask.h>
 #include <linux/pagemap.h>
 #include <linux/mempolicy.h>
@@ -19,6 +20,7 @@
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/io.h>
 
 #include <linux/hugetlb.h>
 #include "internal.h"
@@ -1672,6 +1674,7 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
         BUG_ON(start & ~huge_page_mask(h));
         BUG_ON(end & ~huge_page_mask(h));
 
+        mmu_notifier_invalidate_range_start(mm, start, end);
         spin_lock(&mm->page_table_lock);
         for (address = start; address < end; address += sz) {
                 ptep = huge_pte_offset(mm, address);
@@ -1713,6 +1716,7 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
         }
         spin_unlock(&mm->page_table_lock);
         flush_tlb_range(vma, start, end);
+        mmu_notifier_invalidate_range_end(mm, start, end);
         list_for_each_entry_safe(page, tmp, &page_list, lru) {
                 list_del(&page->lru);
                 put_page(page);
diff --git a/mm/memory.c b/mm/memory.c
index a8ca04faaea6..67f0ab9077d9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -51,6 +51,7 @@
 #include <linux/init.h>
 #include <linux/writeback.h>
 #include <linux/memcontrol.h>
+#include <linux/mmu_notifier.h>
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
@@ -652,6 +653,7 @@ int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         unsigned long next;
         unsigned long addr = vma->vm_start;
         unsigned long end = vma->vm_end;
+        int ret;
 
         /*
          * Don't copy ptes where a page fault will fill them correctly.
@@ -667,17 +669,33 @@ int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         if (is_vm_hugetlb_page(vma))
                 return copy_hugetlb_page_range(dst_mm, src_mm, vma);
 
+        /*
+         * We need to invalidate the secondary MMU mappings only when
+         * there could be a permission downgrade on the ptes of the
+         * parent mm. And a permission downgrade will only happen if
+         * is_cow_mapping() returns true.
+         */
+        if (is_cow_mapping(vma->vm_flags))
+                mmu_notifier_invalidate_range_start(src_mm, addr, end);
+
+        ret = 0;
         dst_pgd = pgd_offset(dst_mm, addr);
         src_pgd = pgd_offset(src_mm, addr);
         do {
                 next = pgd_addr_end(addr, end);
                 if (pgd_none_or_clear_bad(src_pgd))
                         continue;
-                if (copy_pud_range(dst_mm, src_mm, dst_pgd, src_pgd,
-                                                vma, addr, next))
-                        return -ENOMEM;
+                if (unlikely(copy_pud_range(dst_mm, src_mm, dst_pgd, src_pgd,
+                                            vma, addr, next))) {
+                        ret = -ENOMEM;
+                        break;
+                }
         } while (dst_pgd++, src_pgd++, addr = next, addr != end);
-        return 0;
+
+        if (is_cow_mapping(vma->vm_flags))
+                mmu_notifier_invalidate_range_end(src_mm,
+                                                  vma->vm_start, end);
+        return ret;
 }
 
 static unsigned long zap_pte_range(struct mmu_gather *tlb,
@@ -881,7 +899,9 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp,
         unsigned long start = start_addr;
         spinlock_t *i_mmap_lock = details? details->i_mmap_lock: NULL;
         int fullmm = (*tlbp)->fullmm;
+        struct mm_struct *mm = vma->vm_mm;
 
+        mmu_notifier_invalidate_range_start(mm, start_addr, end_addr);
         for ( ; vma && vma->vm_start < end_addr; vma = vma->vm_next) {
                 unsigned long end;
 
@@ -946,6 +966,7 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp,
                 }
         }
 out:
+        mmu_notifier_invalidate_range_end(mm, start_addr, end_addr);
         return start;   /* which is now the end (or restart) address */
 }
 
@@ -1616,10 +1637,11 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr,
 {
         pgd_t *pgd;
         unsigned long next;
-        unsigned long end = addr + size;
+        unsigned long start = addr, end = addr + size;
         int err;
 
         BUG_ON(addr >= end);
+        mmu_notifier_invalidate_range_start(mm, start, end);
         pgd = pgd_offset(mm, addr);
         do {
                 next = pgd_addr_end(addr, end);
@@ -1627,6 +1649,7 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr,
                 if (err)
                         break;
         } while (pgd++, addr = next, addr != end);
+        mmu_notifier_invalidate_range_end(mm, start, end);
         return err;
 }
 EXPORT_SYMBOL_GPL(apply_to_page_range);
@@ -1839,7 +1862,7 @@ gotten:
                  * seen in the presence of one thread doing SMC and another
                  * thread doing COW.
                  */
-                ptep_clear_flush(vma, address, page_table);
+                ptep_clear_flush_notify(vma, address, page_table);
                 set_pte_at(mm, address, page_table, entry);
                 update_mmu_cache(vma, address, entry);
                 lru_cache_add_active(new_page);
diff --git a/mm/mmap.c b/mm/mmap.c
index 5e0cc99e9cd5..245c3d69067b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -26,6 +26,7 @@
 #include <linux/mount.h>
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
+#include <linux/mmu_notifier.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
@@ -2061,6 +2062,7 @@ void exit_mmap(struct mm_struct *mm)
 
         /* mm's last user has gone, and its about to be pulled down */
         arch_exit_mmap(mm);
+        mmu_notifier_release(mm);
 
         lru_add_drain();
         flush_cache_mm(mm);
@@ -2268,3 +2270,161 @@ int install_special_mapping(struct mm_struct *mm,
 
         return 0;
 }
+
+static DEFINE_MUTEX(mm_all_locks_mutex);
+
+static void vm_lock_anon_vma(struct anon_vma *anon_vma)
+{
+        if (!test_bit(0, (unsigned long *) &anon_vma->head.next)) {
+                /*
+                 * The LSB of head.next can't change from under us
+                 * because we hold the mm_all_locks_mutex.
+                 */
+                spin_lock(&anon_vma->lock);
+                /*
+                 * We can safely modify head.next after taking the
+                 * anon_vma->lock. If some other vma in this mm shares
+                 * the same anon_vma we won't take it again.
+                 *
+                 * No need of atomic instructions here, head.next
+                 * can't change from under us thanks to the
+                 * anon_vma->lock.
+                 */
+                if (__test_and_set_bit(0, (unsigned long *)
+                                       &anon_vma->head.next))
+                        BUG();
+        }
+}
+
+static void vm_lock_mapping(struct address_space *mapping)
+{
+        if (!test_bit(AS_MM_ALL_LOCKS, &mapping->flags)) {
+                /*
+                 * AS_MM_ALL_LOCKS can't change from under us because
+                 * we hold the mm_all_locks_mutex.
+                 *
+                 * Operations on ->flags have to be atomic because
+                 * even if AS_MM_ALL_LOCKS is stable thanks to the
+                 * mm_all_locks_mutex, there may be other cpus
+                 * changing other bitflags in parallel to us.
+                 */
+                if (test_and_set_bit(AS_MM_ALL_LOCKS, &mapping->flags))
+                        BUG();
+                spin_lock(&mapping->i_mmap_lock);
+        }
+}
+
+/*
+ * This operation locks against the VM for all pte/vma/mm related
+ * operations that could ever happen on a certain mm. This includes
+ * vmtruncate, try_to_unmap, and all page faults.
+ *
+ * The caller must take the mmap_sem in write mode before calling
+ * mm_take_all_locks(). The caller isn't allowed to release the
+ * mmap_sem until mm_drop_all_locks() returns.
+ *
+ * mmap_sem in write mode is required in order to block all operations
+ * that could modify pagetables and free pages without need of
+ * altering the vma layout (for example populate_range() with
+ * nonlinear vmas). It's also needed in write mode to avoid new
+ * anon_vmas to be associated with existing vmas.
+ *
+ * A single task can't take more than one mm_take_all_locks() in a row
+ * or it would deadlock.
+ *
+ * The LSB in anon_vma->head.next and the AS_MM_ALL_LOCKS bitflag in
+ * mapping->flags avoid to take the same lock twice, if more than one
+ * vma in this mm is backed by the same anon_vma or address_space.
+ *
+ * We can take all the locks in random order because the VM code
+ * taking i_mmap_lock or anon_vma->lock outside the mmap_sem never
+ * takes more than one of them in a row. Secondly we're protected
+ * against a concurrent mm_take_all_locks() by the mm_all_locks_mutex.
+ *
+ * mm_take_all_locks() and mm_drop_all_locks are expensive operations
+ * that may have to take thousand of locks.
+ *
+ * mm_take_all_locks() can fail if it's interrupted by signals.
+ */
+int mm_take_all_locks(struct mm_struct *mm)
+{
+        struct vm_area_struct *vma;
+        int ret = -EINTR;
+
+        BUG_ON(down_read_trylock(&mm->mmap_sem));
+
+        mutex_lock(&mm_all_locks_mutex);
+
+        for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                if (signal_pending(current))
+                        goto out_unlock;
+                if (vma->anon_vma)
+                        vm_lock_anon_vma(vma->anon_vma);
+                if (vma->vm_file && vma->vm_file->f_mapping)
+                        vm_lock_mapping(vma->vm_file->f_mapping);
+        }
+        ret = 0;
+
+out_unlock:
+        if (ret)
+                mm_drop_all_locks(mm);
+
+        return ret;
+}
+
+static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
+{
+        if (test_bit(0, (unsigned long *) &anon_vma->head.next)) {
+                /*
+                 * The LSB of head.next can't change to 0 from under
+                 * us because we hold the mm_all_locks_mutex.
+                 *
+                 * We must however clear the bitflag before unlocking
+                 * the vma so the users using the anon_vma->head will
+                 * never see our bitflag.
+                 *
+                 * No need of atomic instructions here, head.next
+                 * can't change from under us until we release the
+                 * anon_vma->lock.
+                 */
+                if (!__test_and_clear_bit(0, (unsigned long *)
+                                          &anon_vma->head.next))
+                        BUG();
+                spin_unlock(&anon_vma->lock);
+        }
+}
+
+static void vm_unlock_mapping(struct address_space *mapping)
+{
+        if (test_bit(AS_MM_ALL_LOCKS, &mapping->flags)) {
+                /*
+                 * AS_MM_ALL_LOCKS can't change to 0 from under us
+                 * because we hold the mm_all_locks_mutex.
+                 */
+                spin_unlock(&mapping->i_mmap_lock);
+                if (!test_and_clear_bit(AS_MM_ALL_LOCKS,
+                                        &mapping->flags))
+                        BUG();
+        }
+}
+
+/*
+ * The mmap_sem cannot be released by the caller until
+ * mm_drop_all_locks() returns.
+ */
+void mm_drop_all_locks(struct mm_struct *mm)
+{
+        struct vm_area_struct *vma;
+
+        BUG_ON(down_read_trylock(&mm->mmap_sem));
+        BUG_ON(!mutex_is_locked(&mm_all_locks_mutex));
+
+        for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                if (vma->anon_vma)
+                        vm_unlock_anon_vma(vma->anon_vma);
+                if (vma->vm_file && vma->vm_file->f_mapping)
+                        vm_unlock_mapping(vma->vm_file->f_mapping);
+        }
+
+        mutex_unlock(&mm_all_locks_mutex);
+}
diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
new file mode 100644
index 000000000000..5f4ef0250bee
--- /dev/null
+++ b/mm/mmu_notifier.c
@@ -0,0 +1,277 @@
+/*
+ *  linux/mm/mmu_notifier.c
+ *
+ *  Copyright (C) 2008  Qumranet, Inc.
+ *  Copyright (C) 2008  SGI
+ *             Christoph Lameter <clameter@sgi.com>
+ *
+ *  This work is licensed under the terms of the GNU GPL, version 2. See
+ *  the COPYING file in the top-level directory.
+ */
+
+#include <linux/rculist.h>
+#include <linux/mmu_notifier.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/err.h>
+#include <linux/rcupdate.h>
+#include <linux/sched.h>
+
+/*
+ * This function can't run concurrently against mmu_notifier_register
+ * because mm->mm_users > 0 during mmu_notifier_register and exit_mmap
+ * runs with mm_users == 0. Other tasks may still invoke mmu notifiers
+ * in parallel despite there being no task using this mm any more,
+ * through the vmas outside of the exit_mmap context, such as with
+ * vmtruncate. This serializes against mmu_notifier_unregister with
+ * the mmu_notifier_mm->lock in addition to RCU and it serializes
+ * against the other mmu notifiers with RCU. struct mmu_notifier_mm
+ * can't go away from under us as exit_mmap holds an mm_count pin
+ * itself.
+ */
+void __mmu_notifier_release(struct mm_struct *mm)
+{
+        struct mmu_notifier *mn;
+
+        spin_lock(&mm->mmu_notifier_mm->lock);
+        while (unlikely(!hlist_empty(&mm->mmu_notifier_mm->list))) {
+                mn = hlist_entry(mm->mmu_notifier_mm->list.first,
+                                 struct mmu_notifier,
+                                 hlist);
+                /*
+                 * We arrived before mmu_notifier_unregister so
+                 * mmu_notifier_unregister will do nothing other than
+                 * to wait ->release to finish and
+                 * mmu_notifier_unregister to return.
+                 */
+                hlist_del_init_rcu(&mn->hlist);
+                /*
+                 * RCU here will block mmu_notifier_unregister until
+                 * ->release returns.
+                 */
+                rcu_read_lock();
+                spin_unlock(&mm->mmu_notifier_mm->lock);
+                /*
+                 * if ->release runs before mmu_notifier_unregister it
+                 * must be handled as it's the only way for the driver
+                 * to flush all existing sptes and stop the driver
+                 * from establishing any more sptes before all the
+                 * pages in the mm are freed.
+                 */
+                if (mn->ops->release)
+                        mn->ops->release(mn, mm);
+                rcu_read_unlock();
+                spin_lock(&mm->mmu_notifier_mm->lock);
+        }
+        spin_unlock(&mm->mmu_notifier_mm->lock);
+
+        /*
+         * synchronize_rcu here prevents mmu_notifier_release to
+         * return to exit_mmap (which would proceed freeing all pages
+         * in the mm) until the ->release method returns, if it was
+         * invoked by mmu_notifier_unregister.
+         *
+         * The mmu_notifier_mm can't go away from under us because one
+         * mm_count is hold by exit_mmap.
+         */
+        synchronize_rcu();
+}
+
+/*
+ * If no young bitflag is supported by the hardware, ->clear_flush_young can
+ * unmap the address and return 1 or 0 depending if the mapping previously
+ * existed or not.
+ */
+int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
+                                        unsigned long address)
+{
+        struct mmu_notifier *mn;
+        struct hlist_node *n;
+        int young = 0;
+
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+                if (mn->ops->clear_flush_young)
+                        young |= mn->ops->clear_flush_young(mn, mm, address);
+        }
+        rcu_read_unlock();
+
+        return young;
+}
+
+void __mmu_notifier_invalidate_page(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        struct mmu_notifier *mn;
+        struct hlist_node *n;
+
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+                if (mn->ops->invalidate_page)
+                        mn->ops->invalidate_page(mn, mm, address);
+        }
+        rcu_read_unlock();
+}
+
+void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+        struct mmu_notifier *mn;
+        struct hlist_node *n;
+
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+                if (mn->ops->invalidate_range_start)
+                        mn->ops->invalidate_range_start(mn, mm, start, end);
+        }
+        rcu_read_unlock();
+}
+
+void __mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+                                  unsigned long start, unsigned long end)
+{
+        struct mmu_notifier *mn;
+        struct hlist_node *n;
+
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+                if (mn->ops->invalidate_range_end)
+                        mn->ops->invalidate_range_end(mn, mm, start, end);
+        }
+        rcu_read_unlock();
+}
+
+static int do_mmu_notifier_register(struct mmu_notifier *mn,
+                                    struct mm_struct *mm,
+                                    int take_mmap_sem)
+{
+        struct mmu_notifier_mm *mmu_notifier_mm;
+        int ret;
+
+        BUG_ON(atomic_read(&mm->mm_users) <= 0);
+
+        ret = -ENOMEM;
+        mmu_notifier_mm = kmalloc(sizeof(struct mmu_notifier_mm), GFP_KERNEL);
+        if (unlikely(!mmu_notifier_mm))
+                goto out;
+
+        if (take_mmap_sem)
+                down_write(&mm->mmap_sem);
+        ret = mm_take_all_locks(mm);
+        if (unlikely(ret))
+                goto out_cleanup;
+
+        if (!mm_has_notifiers(mm)) {
+                INIT_HLIST_HEAD(&mmu_notifier_mm->list);
+                spin_lock_init(&mmu_notifier_mm->lock);
+                mm->mmu_notifier_mm = mmu_notifier_mm;
+                mmu_notifier_mm = NULL;
+        }
+        atomic_inc(&mm->mm_count);
+
+        /*
+         * Serialize the update against mmu_notifier_unregister. A
+         * side note: mmu_notifier_release can't run concurrently with
+         * us because we hold the mm_users pin (either implicitly as
+         * current->mm or explicitly with get_task_mm() or similar).
+         * We can't race against any other mmu notifier method either
+         * thanks to mm_take_all_locks().
+         */
+        spin_lock(&mm->mmu_notifier_mm->lock);
+        hlist_add_head(&mn->hlist, &mm->mmu_notifier_mm->list);
+        spin_unlock(&mm->mmu_notifier_mm->lock);
+
+        mm_drop_all_locks(mm);
+out_cleanup:
+        if (take_mmap_sem)
+                up_write(&mm->mmap_sem);
+        /* kfree() does nothing if mmu_notifier_mm is NULL */
+        kfree(mmu_notifier_mm);
+out:
+        BUG_ON(atomic_read(&mm->mm_users) <= 0);
+        return ret;
+}
+
+/*
+ * Must not hold mmap_sem nor any other VM related lock when calling
+ * this registration function. Must also ensure mm_users can't go down
+ * to zero while this runs to avoid races with mmu_notifier_release,
+ * so mm has to be current->mm or the mm should be pinned safely such
+ * as with get_task_mm(). If the mm is not current->mm, the mm_users
+ * pin should be released by calling mmput after mmu_notifier_register
+ * returns. mmu_notifier_unregister must be always called to
+ * unregister the notifier. mm_count is automatically pinned to allow
+ * mmu_notifier_unregister to safely run at any time later, before or
+ * after exit_mmap. ->release will always be called before exit_mmap
+ * frees the pages.
+ */
+int mmu_notifier_register(struct mmu_notifier *mn, struct mm_struct *mm)
+{
+        return do_mmu_notifier_register(mn, mm, 1);
+}
+EXPORT_SYMBOL_GPL(mmu_notifier_register);
+
+/*
+ * Same as mmu_notifier_register but here the caller must hold the
+ * mmap_sem in write mode.
+ */
+int __mmu_notifier_register(struct mmu_notifier *mn, struct mm_struct *mm)
+{
+        return do_mmu_notifier_register(mn, mm, 0);
+}
+EXPORT_SYMBOL_GPL(__mmu_notifier_register);
+
+/* this is called after the last mmu_notifier_unregister() returned */
+void __mmu_notifier_mm_destroy(struct mm_struct *mm)
+{
+        BUG_ON(!hlist_empty(&mm->mmu_notifier_mm->list));
+        kfree(mm->mmu_notifier_mm);
+        mm->mmu_notifier_mm = LIST_POISON1; /* debug */
+}
+
+/*
+ * This releases the mm_count pin automatically and frees the mm
+ * structure if it was the last user of it. It serializes against
+ * running mmu notifiers with RCU and against mmu_notifier_unregister
+ * with the unregister lock + RCU. All sptes must be dropped before
+ * calling mmu_notifier_unregister. ->release or any other notifier
+ * method may be invoked concurrently with mmu_notifier_unregister,
+ * and only after mmu_notifier_unregister returned we're guaranteed
+ * that ->release or any other method can't run anymore.
+ */
+void mmu_notifier_unregister(struct mmu_notifier *mn, struct mm_struct *mm)
+{
+        BUG_ON(atomic_read(&mm->mm_count) <= 0);
+
+        spin_lock(&mm->mmu_notifier_mm->lock);
+        if (!hlist_unhashed(&mn->hlist)) {
+                hlist_del_rcu(&mn->hlist);
+
+                /*
+                 * RCU here will force exit_mmap to wait ->release to finish
+                 * before freeing the pages.
+                 */
+                rcu_read_lock();
+                spin_unlock(&mm->mmu_notifier_mm->lock);
+                /*
+                 * exit_mmap will block in mmu_notifier_release to
+                 * guarantee ->release is called before freeing the
+                 * pages.
+                 */
+                if (mn->ops->release)
+                        mn->ops->release(mn, mm);
+                rcu_read_unlock();
+        } else
+                spin_unlock(&mm->mmu_notifier_mm->lock);
+
+        /*
+         * Wait any running method to finish, of course including
+         * ->release if it was run by mmu_notifier_relase instead of us.
+         */
+        synchronize_rcu();
+
+        BUG_ON(atomic_read(&mm->mm_count) <= 0);
+
+        mmdrop(mm);
+}
+EXPORT_SYMBOL_GPL(mmu_notifier_unregister);
diff --git a/mm/mprotect.c b/mm/mprotect.c
index abd645a3b0a0..fded06f923f4 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -21,6 +21,7 @@
 #include <linux/syscalls.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>
+#include <linux/mmu_notifier.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
@@ -203,10 +204,12 @@ success:
                 dirty_accountable = 1;
         }
 
+        mmu_notifier_invalidate_range_start(mm, start, end);
         if (is_vm_hugetlb_page(vma))
                 hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
         else
                 change_protection(vma, start, end, vma->vm_page_prot, dirty_accountable);
+        mmu_notifier_invalidate_range_end(mm, start, end);
         vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
         vm_stat_account(mm, newflags, vma->vm_file, nrpages);
         return 0;
diff --git a/mm/mremap.c b/mm/mremap.c
index 08e3c7f2bd15..1a7743923c8c 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -18,6 +18,7 @@
 #include <linux/highmem.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/mmu_notifier.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
@@ -74,7 +75,11 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
         struct mm_struct *mm = vma->vm_mm;
         pte_t *old_pte, *new_pte, pte;
         spinlock_t *old_ptl, *new_ptl;
+        unsigned long old_start;
 
+        old_start = old_addr;
+        mmu_notifier_invalidate_range_start(vma->vm_mm,
+                                            old_start, old_end);
         if (vma->vm_file) {
                 /*
                  * Subtle point from Rajesh Venkatasubramanian: before
@@ -116,6 +121,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
         pte_unmap_unlock(old_pte - 1, old_ptl);
         if (mapping)
                 spin_unlock(&mapping->i_mmap_lock);
+        mmu_notifier_invalidate_range_end(vma->vm_mm, old_start, old_end);
 }
 
 #define LATENCY_LIMIT   (64 * PAGE_SIZE)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6da667274df5..3cf3d05b6bd4 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2372,7 +2372,7 @@ static void build_zonelist_cache(pg_data_t *pgdat)
 
 #endif  /* CONFIG_NUMA */
 
-/* return values int ....just for stop_machine_run() */
+/* return values int ....just for stop_machine() */
 static int __build_all_zonelists(void *dummy)
 {
         int nid;
@@ -2397,7 +2397,7 @@ void build_all_zonelists(void)
         } else {
                 /* we have to stop all cpus to guarantee there is no user
                    of zonelist */
-                stop_machine_run(__build_all_zonelists, NULL, NR_CPUS);
+                stop_machine(__build_all_zonelists, NULL, NULL);
                 /* cpuset refresh routine should be here */
         }
         vm_total_pages = nr_free_pagecache_pages();
diff --git a/mm/rmap.c b/mm/rmap.c
index 39ae5a9bf382..99bc3f9cd796 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -49,6 +49,7 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/memcontrol.h>
+#include <linux/mmu_notifier.h>
 
 #include <asm/tlbflush.h>
 
@@ -287,7 +288,7 @@ static int page_referenced_one(struct page *page,
         if (vma->vm_flags & VM_LOCKED) {
                 referenced++;
                 *mapcount = 1;  /* break early from loop */
-        } else if (ptep_clear_flush_young(vma, address, pte))
+        } else if (ptep_clear_flush_young_notify(vma, address, pte))
                 referenced++;
 
         /* Pretend the page is referenced if the task has the
@@ -457,7 +458,7 @@ static int page_mkclean_one(struct page *page, struct vm_area_struct *vma)
                 pte_t entry;
 
                 flush_cache_page(vma, address, pte_pfn(*pte));
-                entry = ptep_clear_flush(vma, address, pte);
+                entry = ptep_clear_flush_notify(vma, address, pte);
                 entry = pte_wrprotect(entry);
                 entry = pte_mkclean(entry);
                 set_pte_at(mm, address, pte, entry);
@@ -705,14 +706,14 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
          * skipped over this mm) then we should reactivate it.
          */
         if (!migration && ((vma->vm_flags & VM_LOCKED) ||
-                        (ptep_clear_flush_young(vma, address, pte)))) {
+                        (ptep_clear_flush_young_notify(vma, address, pte)))) {
                 ret = SWAP_FAIL;
                 goto out_unmap;
         }
 
         /* Nuke the page table entry. */
         flush_cache_page(vma, address, page_to_pfn(page));
-        pteval = ptep_clear_flush(vma, address, pte);
+        pteval = ptep_clear_flush_notify(vma, address, pte);
 
         /* Move the dirty bit to the physical page now the pte is gone. */
         if (pte_dirty(pteval))
@@ -837,12 +838,12 @@ static void try_to_unmap_cluster(unsigned long cursor,
                 page = vm_normal_page(vma, address, *pte);
                 BUG_ON(!page || PageAnon(page));
 
-                if (ptep_clear_flush_young(vma, address, pte))
+                if (ptep_clear_flush_young_notify(vma, address, pte))
                         continue;
 
                 /* Nuke the page table entry. */
                 flush_cache_page(vma, address, pte_pfn(*pte));
-                pteval = ptep_clear_flush(vma, address, pte);
+                pteval = ptep_clear_flush_notify(vma, address, pte);
 
                 /* If nonlinear, store the file page offset in the pte. */
                 if (page->index != linear_page_index(vma, address))
diff --git a/mm/shmem.c b/mm/shmem.c
index 952d361774bb..c1e5a3b4f758 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1513,7 +1513,6 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev)
                 inode->i_uid = current->fsuid;
                 inode->i_gid = current->fsgid;
                 inode->i_blocks = 0;
-                inode->i_mapping->a_ops = &shmem_aops;
                 inode->i_mapping->backing_dev_info = &shmem_backing_dev_info;
                 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                 inode->i_generation = get_seconds();
@@ -1528,6 +1527,7 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev)
                         init_special_inode(inode, mode, dev);
                         break;
                 case S_IFREG:
+                        inode->i_mapping->a_ops = &shmem_aops;
                         inode->i_op = &shmem_inode_operations;
                         inode->i_fop = &shmem_file_operations;
                         mpol_shared_policy_init(&info->policy,
@@ -1929,6 +1929,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
                         return error;
                 }
                 unlock_page(page);
+                inode->i_mapping->a_ops = &shmem_aops;
                 inode->i_op = &shmem_symlink_inode_operations;
                 kaddr = kmap_atomic(page, KM_USER0);
                 memcpy(kaddr, symname, len);
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 743d85fcd651..1c2e3ec2eb57 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -226,7 +226,7 @@ static inline void dccp_csum_outgoing(struct sk_buff *skb)
 
 extern void dccp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb);
 
-extern int  dccp_retransmit_skb(struct sock *sk, struct sk_buff *skb);
+extern int  dccp_retransmit_skb(struct sock *sk);
 
 extern void dccp_send_ack(struct sock *sk);
 extern void dccp_reqsk_send_ack(struct sk_buff *sk, struct request_sock *rsk);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a835b88237cb..882c5c4de69e 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -196,8 +196,8 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk,
 static void dccp_v4_err(struct sk_buff *skb, u32 info)
 {
         const struct iphdr *iph = (struct iphdr *)skb->data;
-        const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data +
-                                                        (iph->ihl << 2));
+        const u8 offset = iph->ihl << 2;
+        const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
         struct dccp_sock *dp;
         struct inet_sock *inet;
         const int type = icmp_hdr(skb)->type;
@@ -207,7 +207,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
         int err;
         struct net *net = dev_net(skb->dev);
 
-        if (skb->len < (iph->ihl << 2) + 8) {
+        if (skb->len < offset + sizeof(*dh) ||
+            skb->len < offset + __dccp_basic_hdr_len(dh)) {
                 ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
                 return;
         }
@@ -238,7 +239,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
         dp = dccp_sk(sk);
         seq = dccp_hdr_seq(dh);
         if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&
-            !between48(seq, dp->dccps_swl, dp->dccps_swh)) {
+            !between48(seq, dp->dccps_awl, dp->dccps_awh)) {
                 NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
                 goto out;
         }
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index da509127e00c..5e1ee0da2c40 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -89,12 +89,19 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 {
         struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data;
         const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
+        struct dccp_sock *dp;
         struct ipv6_pinfo *np;
         struct sock *sk;
         int err;
         __u64 seq;
         struct net *net = dev_net(skb->dev);
 
+        if (skb->len < offset + sizeof(*dh) ||
+            skb->len < offset + __dccp_basic_hdr_len(dh)) {
+                ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);
+                return;
+        }
+
         sk = inet6_lookup(net, &dccp_hashinfo,
                         &hdr->daddr, dh->dccph_dport,
                         &hdr->saddr, dh->dccph_sport, inet6_iif(skb));
@@ -116,6 +123,14 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         if (sk->sk_state == DCCP_CLOSED)
                 goto out;
 
+        dp = dccp_sk(sk);
+        seq = dccp_hdr_seq(dh);
+        if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&
+            !between48(seq, dp->dccps_awl, dp->dccps_awh)) {
+                NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
+                goto out;
+        }
+
         np = inet6_sk(sk);
 
         if (type == ICMPV6_PKT_TOOBIG) {
@@ -168,7 +183,6 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
         icmpv6_err_convert(type, code, &err);
 
-        seq = dccp_hdr_seq(dh);
         /* Might be for an request_sock */
         switch (sk->sk_state) {
                 struct request_sock *req, **prev;
diff --git a/net/dccp/output.c b/net/dccp/output.c
index fe20068c5d8e..d06945c7d3df 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -53,8 +53,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                                           dccp_packet_hdr_len(dcb->dccpd_type);
                 int err, set_ack = 1;
                 u64 ackno = dp->dccps_gsr;
-
-                dccp_inc_seqno(&dp->dccps_gss);
+                /*
+                 * Increment GSS here already in case the option code needs it.
+                 * Update GSS for real only if option processing below succeeds.
+                 */
+                dcb->dccpd_seq = ADD48(dp->dccps_gss, 1);
 
                 switch (dcb->dccpd_type) {
                 case DCCP_PKT_DATA:
@@ -66,6 +69,9 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
 
                 case DCCP_PKT_REQUEST:
                         set_ack = 0;
+                        /* Use ISS on the first (non-retransmitted) Request. */
+                        if (icsk->icsk_retransmits == 0)
+                                dcb->dccpd_seq = dp->dccps_iss;
                         /* fall through */
 
                 case DCCP_PKT_SYNC:
@@ -84,8 +90,6 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                         break;
                 }
 
-                dcb->dccpd_seq = dp->dccps_gss;
-
                 if (dccp_insert_options(sk, skb)) {
                         kfree_skb(skb);
                         return -EPROTO;
@@ -103,7 +107,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                 /* XXX For now we're using only 48 bits sequence numbers */
                 dh->dccph_x     = 1;
 
-                dp->dccps_awh = dp->dccps_gss;
+                dccp_update_gss(sk, dcb->dccpd_seq);
                 dccp_hdr_set_seq(dh, dp->dccps_gss);
                 if (set_ack)
                         dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), ackno);
@@ -112,6 +116,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                 case DCCP_PKT_REQUEST:
                         dccp_hdr_request(skb)->dccph_req_service =
                                                         dp->dccps_service;
+                        /*
+                         * Limit Ack window to ISS <= P.ackno <= GSS, so that
+                         * only Responses to Requests we sent are considered.
+                         */
+                        dp->dccps_awl = dp->dccps_iss;
                         break;
                 case DCCP_PKT_RESET:
                         dccp_hdr_reset(skb)->dccph_reset_code =
@@ -284,14 +293,26 @@ void dccp_write_xmit(struct sock *sk, int block)
         }
 }
 
-int dccp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
+/**
+ * dccp_retransmit_skb  -  Retransmit Request, Close, or CloseReq packets
+ * There are only four retransmittable packet types in DCCP:
+ * - Request  in client-REQUEST  state (sec. 8.1.1),
+ * - CloseReq in server-CLOSEREQ state (sec. 8.3),
+ * - Close    in   node-CLOSING  state (sec. 8.3),
+ * - Acks in client-PARTOPEN state (sec. 8.1.5, handled by dccp_delack_timer()).
+ * This function expects sk->sk_send_head to contain the original skb.
+ */
+int dccp_retransmit_skb(struct sock *sk)
 {
+        WARN_ON(sk->sk_send_head == NULL);
+
         if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk) != 0)
                 return -EHOSTUNREACH; /* Routing failure or similar. */
 
-        return dccp_transmit_skb(sk, (skb_cloned(skb) ?
-                                      pskb_copy(skb, GFP_ATOMIC):
-                                      skb_clone(skb, GFP_ATOMIC)));
+        /* this count is used to distinguish original and retransmitted skb */
+        inet_csk(sk)->icsk_retransmits++;
+
+        return dccp_transmit_skb(sk, skb_clone(sk->sk_send_head, GFP_ATOMIC));
 }
 
 struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
@@ -437,19 +458,7 @@ static inline void dccp_connect_init(struct sock *sk)
 
         dccp_sync_mss(sk, dst_mtu(dst));
 
-        /*
-         * SWL and AWL are initially adjusted so that they are not less than
-         * the initial Sequence Numbers received and sent, respectively:
-         *      SWL := max(GSR + 1 - floor(W/4), ISR),
-         *      AWL := max(GSS - W' + 1, ISS).
-         * These adjustments MUST be applied only at the beginning of the
-         * connection.
-         */
-        dccp_update_gss(sk, dp->dccps_iss);
-        dccp_set_seqno(&dp->dccps_awl, max48(dp->dccps_awl, dp->dccps_iss));
-
-        /* S.GAR - greatest valid acknowledgement number received on a non-Sync;
-         *         initialized to S.ISS (sec. 8.5)                            */
+        /* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */
         dp->dccps_gar = dp->dccps_iss;
 
         icsk->icsk_retransmits = 0;
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 6a5b961b6f5c..54b3c7e9e016 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -99,21 +99,11 @@ static void dccp_retransmit_timer(struct sock *sk)
         }
 
         /*
-         * sk->sk_send_head has to have one skb with
-         * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP
-         * packet types. The only packets eligible for retransmission are:
-         *      -- Requests in client-REQUEST  state (sec. 8.1.1)
-         *      -- Acks     in client-PARTOPEN state (sec. 8.1.5)
-         *      -- CloseReq in server-CLOSEREQ state (sec. 8.3)
-         *      -- Close    in   node-CLOSING  state (sec. 8.3)                */
-        WARN_ON(sk->sk_send_head == NULL);
-
-        /*
          * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was
          * sent, no need to retransmit, this sock is dead.
          */
         if (dccp_write_timeout(sk))
-                goto out;
+                return;
 
         /*
          * We want to know the number of packets retransmitted, not the
@@ -122,30 +112,28 @@ static void dccp_retransmit_timer(struct sock *sk)
         if (icsk->icsk_retransmits == 0)
                 DCCP_INC_STATS_BH(DCCP_MIB_TIMEOUTS);
 
-        if (dccp_retransmit_skb(sk, sk->sk_send_head) < 0) {
+        if (dccp_retransmit_skb(sk) != 0) {
                 /*
                  * Retransmission failed because of local congestion,
                  * do not backoff.
                  */
-                if (icsk->icsk_retransmits == 0)
+                if (--icsk->icsk_retransmits == 0)
                         icsk->icsk_retransmits = 1;
                 inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
                                           min(icsk->icsk_rto,
                                               TCP_RESOURCE_PROBE_INTERVAL),
                                           DCCP_RTO_MAX);
-                goto out;
+                return;
         }
 
 backoff:
         icsk->icsk_backoff++;
-        icsk->icsk_retransmits++;
 
         icsk->icsk_rto = min(icsk->icsk_rto << 1, DCCP_RTO_MAX);
         inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto,
                                   DCCP_RTO_MAX);
         if (icsk->icsk_retransmits > sysctl_dccp_retries1)
                 __sk_dst_reset(sk);
-out:;
 }
 
 static void dccp_write_timer(unsigned long data)
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index a42b64d040c4..38ccb6dfb02e 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -104,9 +104,7 @@ out:
 
 static int ipcomp4_init_state(struct xfrm_state *x)
 {
-        int err;
-        struct ipcomp_data *ipcd;
-        struct xfrm_algo_desc *calg_desc;
+        int err = -EINVAL;
 
         x->props.header_len = 0;
         switch (x->props.mode) {
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a507c5e27d0e..380d6474cf66 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2914,7 +2914,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table,
         return 0;
 }
 
-ctl_table ipv4_route_table[] = {
+static ctl_table ipv4_route_table[] = {
         {
                 .ctl_name       = NET_IPV4_ROUTE_GC_THRESH,
                 .procname       = "gc_thresh",
@@ -3216,6 +3216,15 @@ int __init ip_rt_init(void)
         return rc;
 }
 
+/*
+ * We really need to sanitize the damn ipv4 init order, then all
+ * this nonsense will go away.
+ */
+void __init ip_static_sysctl_init(void)
+{
+        register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+}
+
 EXPORT_SYMBOL(__ip_select_ident);
 EXPORT_SYMBOL(ip_route_input);
 EXPORT_SYMBOL(ip_route_output_key);
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index d63e9388d92d..770d827f5ab8 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -401,13 +401,6 @@ static struct ctl_table ipv4_table[] = {
                 .proc_handler   = &ipv4_local_port_range,
                 .strategy       = &ipv4_sysctl_local_port_range,
         },
-        {
-                .ctl_name       = NET_IPV4_ROUTE,
-                .procname       = "route",
-                .maxlen         = 0,
-                .mode           = 0555,
-                .child          = ipv4_route_table
-        },
 #ifdef CONFIG_IP_MULTICAST
         {
                 .ctl_name       = NET_IPV4_IGMP_MAX_MEMBERSHIPS,
@@ -882,11 +875,4 @@ static __init int sysctl_ipv4_init(void)
         return 0;
 }
 
-/* set enough of tree skeleton to get rid of ordering problems */
-void __init ip_static_sysctl_init(void)
-{
-        static ctl_table table[1];
-        register_sysctl_paths(net_ipv4_ctl_path, table);
-}
-
 __initcall(sysctl_ipv4_init);
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index c708ca842298..95055f8c3f35 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -934,6 +934,11 @@ static int __init inet6_init(void)
         if (err)
                 goto out_unregister_sock;
 
+#ifdef CONFIG_SYSCTL
+        err = ipv6_static_sysctl_register();
+        if (err)
+                goto static_sysctl_fail;
+#endif
         /*
          *      ipngwg API draft makes clear that the correct semantics
          *      for TCP and UDP is to consider one TCP and UDP instance
@@ -1058,6 +1063,10 @@ ipmr_fail:
 icmp_fail:
         unregister_pernet_subsys(&inet6_net_ops);
 register_pernet_fail:
+#ifdef CONFIG_SYSCTL
+        ipv6_static_sysctl_unregister();
+static_sysctl_fail:
+#endif
         cleanup_ipv6_mibs();
 out_unregister_sock:
         sock_unregister(PF_INET6);
@@ -1113,6 +1122,9 @@ static void __exit inet6_exit(void)
         rawv6_exit();
 
         unregister_pernet_subsys(&inet6_net_ops);
+#ifdef CONFIG_SYSCTL
+        ipv6_static_sysctl_unregister();
+#endif
         cleanup_ipv6_mibs();
         proto_unregister(&rawv6_prot);
         proto_unregister(&udplitev6_prot);
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 0cfcea42153a..4545e4306862 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -134,9 +134,7 @@ out:
 
 static int ipcomp6_init_state(struct xfrm_state *x)
 {
-        int err;
-        struct ipcomp_data *ipcd;
-        struct xfrm_algo_desc *calg_desc;
+        int err = -EINVAL;
 
         x->props.header_len = 0;
         switch (x->props.mode) {
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 5c99274558bf..e6dfaeac6be3 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -150,3 +150,19 @@ void ipv6_sysctl_unregister(void)
         unregister_net_sysctl_table(ip6_header);
         unregister_pernet_subsys(&ipv6_sysctl_net_ops);
 }
+
+static struct ctl_table_header *ip6_base;
+
+int ipv6_static_sysctl_register(void)
+{
+        static struct ctl_table empty[1];
+        ip6_base = register_net_sysctl_rotable(net_ipv6_ctl_path, empty);
+        if (ip6_base == NULL)
+                return -ENOMEM;
+        return 0;
+}
+
+void ipv6_static_sysctl_unregister(void)
+{
+        unregister_net_sysctl_table(ip6_base);
+}
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 835d27413083..5a32cb7c4bb4 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -310,8 +310,7 @@ svc_pool_map_set_cpumask(struct task_struct *task, unsigned int pidx)
         switch (m->mode) {
         case SVC_POOL_PERCPU:
         {
-                cpumask_of_cpu_ptr(cpumask, node);
-                set_cpus_allowed_ptr(task, cpumask);
+                set_cpus_allowed_ptr(task, &cpumask_of_cpu(node));
                 break;
         }
         case SVC_POOL_PERNODE:
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index cefbc367d8be..972201cd5fa7 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -73,7 +73,9 @@ static struct ctl_table_root net_sysctl_ro_root = {
 
 static int sysctl_net_init(struct net *net)
 {
-        setup_sysctl_set(&net->sysctls, NULL, is_seen);
+        setup_sysctl_set(&net->sysctls,
+                         &net_sysctl_ro_root.default_set,
+                         is_seen);
         return 0;
 }
 
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 53dae3eb3d1f..612dc13ddd85 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -1,194 +1,98 @@
 # ==========================================================================
 # Installing headers
 #
-# header-y files will be installed verbatim
-# unifdef-y are the files where unifdef will be run before installing files
-# objhdr-y are generated files that will be installed verbatim
+# header-y  - list files to be installed. They are preprocessed
+#             to remove __KERNEL__ section of the file
+# unifdef-y - Same as header-y. Obsolete
+# objhdr-y  - Same as header-y but for generated files
 #
 # ==========================================================================
 
-UNIFDEF := scripts/unifdef -U__KERNEL__
-
-# Eliminate the contents of (and inclusions of) compiler.h
-HDRSED  := sed  -e "s/ inline / __inline__ /g" \
-                -e "s/[[:space:]]__user[[:space:]]\{1,\}/ /g" \
-                -e "s/(__user[[:space:]]\{1,\}/ (/g" \
-                -e "s/[[:space:]]__force[[:space:]]\{1,\}/ /g" \
-                -e "s/(__force[[:space:]]\{1,\}/ (/g" \
-                -e "s/[[:space:]]__iomem[[:space:]]\{1,\}/ /g" \
-                -e "s/(__iomem[[:space:]]\{1,\}/ (/g" \
-                -e "s/[[:space:]]__attribute_const__[[:space:]]\{1,\}/\ /g" \
-                -e "s/[[:space:]]__attribute_const__$$//" \
-                -e "/^\#include <linux\/compiler.h>/d"
-
+# called may set destination dir (when installing to asm/)
 _dst := $(if $(dst),$(dst),$(obj))
 
-ifeq (,$(patsubst include/asm/%,,$(obj)/))
-# For producing the generated stuff in include/asm for biarch builds, include
-# both sets of Kbuild files; we'll generate anything which is mentioned in
-# _either_ arch, and recurse into subdirectories which are mentioned in either
-# arch. Since some directories may exist in one but not the other, we must
-# use $(wildcard...). 
-GENASM := 1
-archasm    := $(subst include/asm,asm-$(ARCH),$(obj))
-altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
-KBUILDFILES := $(wildcard $(srctree)/include/$(archasm)/Kbuild $(srctree)/include/$(altarchasm)/Kbuild)
-else
-KBUILDFILES := $(srctree)/$(obj)/Kbuild
-endif
+kbuild-file := $(srctree)/$(obj)/Kbuild
+include $(kbuild-file)
 
-include $(KBUILDFILES)
+include scripts/Kbuild.include
 
-include scripts/Kbuild.include 
+install       := $(INSTALL_HDR_PATH)/$(_dst)
 
-# If this is include/asm-$(ARCH) and there's no $(ALTARCH), then
-# override $(_dst) so that we install to include/asm directly.
-# Unless $(BIASMDIR) is set, in which case we're probably doing
-# a 'headers_install_all' build and we should keep the -$(ARCH)
-# in the directory name.
-ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH)$(BIASMDIR))
-     _dst := include/asm
-endif
+header-y      := $(sort $(header-y) $(unifdef-y))
+subdirs       := $(patsubst %/,%,$(filter %/, $(header-y)))
+header-y      := $(filter-out %/, $(header-y))
 
-header-y        := $(sort $(header-y))
-unifdef-y       := $(sort $(unifdef-y))
-subdir-y        := $(patsubst %/,%,$(filter %/, $(header-y)))
-header-y        := $(filter-out %/, $(header-y))
-header-y        := $(filter-out $(unifdef-y),$(header-y))
+# files used to track state of install/check
+install-file  := $(install)/.install
+check-file    := $(install)/.check
 
-# stamp files for header checks
-check-y         := $(patsubst %,.check.%,$(header-y) $(unifdef-y) $(objhdr-y))
+# all headers files for this dir
+all-files     := $(header-y) $(objhdr-y)
+input-files   := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
+                 $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
+output-files  := $(addprefix $(install)/, $(all-files))
 
 # Work out what needs to be removed
-oldheaders      := $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$(wildcard $(INSTALL_HDR_PATH)/$(_dst)/*.h))
-unwanted        := $(filter-out $(header-y) $(unifdef-y) $(objhdr-y),$(oldheaders))
+oldheaders    := $(patsubst $(install)/%,%,$(wildcard $(install)/*.h))
+unwanted      := $(filter-out $(all-files),$(oldheaders))
 
-oldcheckstamps  := $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$(wildcard $(INSTALL_HDR_PATH)/$(_dst)/.check.*.h))
-unwanted        += $(filter-out $(check-y),$(oldcheckstamps))
+# Prefix unwanted with full paths to $(INSTALL_HDR_PATH)
+unwanted-file := $(addprefix $(install)/, $(unwanted))
 
-# Prefix them all with full paths to $(INSTALL_HDR_PATH)
-header-y        := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(header-y))
-unifdef-y       := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(unifdef-y))
-objhdr-y        := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(objhdr-y))
-check-y         := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(check-y))
+printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
 
+quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
+                            file$(if $(word 2, $(all-files)),s))
+      cmd_install = \
+        $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
+        $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
+        touch $@
 
-ifdef ALTARCH
-ifeq ($(obj),include/asm-$(ARCH))
-altarch-y       := altarch-dir
-endif
-endif
+quiet_cmd_remove = REMOVE  $(unwanted)
+      cmd_remove = rm -f $(unwanted-file)
 
-# Make the definitions visible for recursive make invocations
-export ALTARCH
-export ARCHDEF
-export ALTARCHDEF
-
-quiet_cmd_o_hdr_install   = INSTALL $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
-      cmd_o_hdr_install   = cp $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,$(objtree)/$(obj)/%,$@) \
-                            $(INSTALL_HDR_PATH)/$(_dst)
-
-quiet_cmd_headers_install = INSTALL $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
-      cmd_headers_install = $(HDRSED) $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,$(srctree)/$(obj)/%,$@)  \
-                            > $@
-
-quiet_cmd_unifdef         = UNIFDEF $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
-      cmd_unifdef         = $(UNIFDEF) $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,$(srctree)/$(obj)/%,$@) \
-                                   | $(HDRSED) > $@ || :
-
-quiet_cmd_check           = CHECK   $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/.check.%,$(_dst)/%,$@)
-      cmd_check           = $(CONFIG_SHELL) $(srctree)/scripts/hdrcheck.sh \
-                              $(INSTALL_HDR_PATH)/include $(subst /.check.,/,$@) $@
-
-quiet_cmd_remove          = REMOVE  $(_dst)/$@
-      cmd_remove          = rm -f $(INSTALL_HDR_PATH)/$(_dst)/$@
-
-quiet_cmd_mkdir           = MKDIR   $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
-      cmd_mkdir           = mkdir -p $@
-
-quiet_cmd_gen             = GEN     $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
-      cmd_gen             = \
-FNAME=$(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$@);                   \
-STUBDEF=__ASM_STUB_`echo $$FNAME | tr a-z.- A-Z__`;                     \
-(echo "/* File autogenerated by 'make headers_install' */" ;            \
-echo "\#ifndef $$STUBDEF" ;                                             \
-echo "\#define $$STUBDEF" ;                                             \
-echo "\# if $(ARCHDEF)" ;                                               \
-if [ -r $(subst /$(_dst)/,/include/$(archasm)/,$@) ]; then              \
-        echo "\#  include <$(archasm)/$$FNAME>" ;                       \
-else                                                                    \
-        echo "\#  error $(archasm)/$$FNAME does not exist in"           \
-                        "the $(ARCH) architecture" ;                    \
-fi ;                                                                    \
-echo "\# elif $(ALTARCHDEF)" ;                                          \
-if [ -r $(subst /$(_dst)/,/include/$(altarchasm)/,$@) ]; then           \
-        echo "\#  include <$(altarchasm)/$$FNAME>" ;                    \
-else                                                                    \
-        echo "\#  error $(altarchasm)/$$FNAME does not exist in"        \
-                        "the $(ALTARCH) architecture" ;                 \
-fi ;                                                                    \
-echo "\# else" ;                                                        \
-echo "\#  warning This machine appears to be"                           \
-                 "neither $(ARCH) nor $(ALTARCH)." ;                    \
-echo "\# endif" ;                                                       \
-echo "\#endif /* $$STUBDEF */" ;                                        \
-) > $@
-
-.PHONY: __headersinst __headerscheck
-
-ifdef HDRCHECK
-__headerscheck: $(subdir-y) $(check-y)
-        @true
-
-$(check-y) : $(INSTALL_HDR_PATH)/$(_dst)/.check.%.h : $(INSTALL_HDR_PATH)/$(_dst)/%.h 
-        $(call cmd,check)
-
-# Other dependencies for $(check-y)
-include /dev/null $(wildcard $(check-y))
-
-# ... but leave $(check-y) as .PHONY for now until those deps are actually correct.
-.PHONY: $(check-y)
+quiet_cmd_check = CHECK   $(printdir) ($(words $(all-files)) files)
+      cmd_check = $(PERL) $< $(INSTALL_HDR_PATH)/include $(SRCARCH) \
+                  $(addprefix $(install)/, $(all-files));           \
+                  touch $@
 
-else
-# Rules for installing headers
-__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y)
-        @true
+PHONY += __headersinst __headerscheck
 
-$(objhdr-y) $(subdir-y) $(header-y) $(unifdef-y): | $(INSTALL_HDR_PATH)/$(_dst) $(unwanted)
-
-$(INSTALL_HDR_PATH)/$(_dst):
-        $(call cmd,mkdir)
-
-.PHONY: $(unwanted)
-$(unwanted):
-        $(call cmd,remove)
+ifndef HDRCHECK
+# Rules for installing headers
+__headersinst: $(subdirs) $(install-file)
+        @:
 
-ifdef GENASM
-$(objhdr-y) $(header-y) $(unifdef-y): $(KBUILDFILES)
-        $(call cmd,gen)
+targets += $(install-file)
+$(install-file): scripts/headers_install.pl $(input-files) FORCE
+        $(if $(unwanted),$(call cmd,remove),)
+        $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+        $(call if_changed,install)
 
 else
-$(objhdr-y) :           $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(objtree)/$(obj)/%.h $(KBUILDFILES)
-        $(call cmd,o_hdr_install)
+__headerscheck: $(subdirs) $(check-file)
+        @:
 
-$(header-y) :           $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(KBUILDFILES)
-        $(call cmd,headers_install)
+targets += $(check-file)
+$(check-file): scripts/headers_check.pl $(output-files) FORCE
+        $(call if_changed,check)
 
-$(unifdef-y) :          $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(KBUILDFILES)
-        $(call cmd,unifdef)
-endif
 endif
 
-hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+# Recursion
+hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+.PHONY: $(subdirs)
+$(subdirs):
+        $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
 
-.PHONY: altarch-dir
-# All the files in the normal arch dir must be created first, since we test
-# for their existence.
-altarch-dir: $(subdir-y) $(header-y) $(unifdef-y) $(objhdr-y)
-        $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
-        $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm$(BIASMDIR)
+targets := $(wildcard $(sort $(targets)))
+cmd_files := $(wildcard \
+             $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
 
-# Recursion
-.PHONY: $(subdir-y)
-$(subdir-y):
-        $(Q)$(MAKE) $(hdrinst)=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
+ifneq ($(cmd_files),)
+        include $(cmd_files)
+endif
+
+.PHONY: $(PHONY)
+PHONY += FORCE
+FORCE: ;
diff --git a/scripts/diffconfig b/scripts/diffconfig
new file mode 100755
index 000000000000..b91f3e34d44d
--- /dev/null
+++ b/scripts/diffconfig
@@ -0,0 +1,129 @@
+#!/usr/bin/python
+#
+# diffconfig - a tool to compare .config files.
+#
+# originally written in 2006 by Matt Mackall
+#  (at least, this was in his bloatwatch source code)
+# last worked on 2008 by Tim Bird
+#
+
+import sys, os
+
+def usage():
+    print """Usage: diffconfig [-h] [-m] [<config1> <config2>]
+
+Diffconfig is a simple utility for comparing two .config files.
+Using standard diff to compare .config files often includes extraneous and
+distracting information.  This utility produces sorted output with only the
+changes in configuration values between the two files.
+
+Added and removed items are shown with a leading plus or minus, respectively.
+Changed items show the old and new values on a single line.
+
+If -m is specified, then output will be in "merge" style, which has the
+changed and new values in kernel config option format.
+
+If no config files are specified, .config and .config.old are used.
+
+Example usage:
+ $ diffconfig .config config-with-some-changes
+-EXT2_FS_XATTR  n
+-EXT2_FS_XIP  n
+ CRAMFS  n -> y
+ EXT2_FS  y -> n
+ LOG_BUF_SHIFT  14 -> 16
+ PRINTK_TIME  n -> y
+"""
+    sys.exit(0)
+
+# returns a dictionary of name/value pairs for config items in the file
+def readconfig(config_file):
+    d = {}
+    for line in config_file:
+        line = line[:-1]
+        if line[:7] == "CONFIG_":
+            name, val = line[7:].split("=", 1)
+            d[name] = val
+        if line[-11:] == " is not set":
+            d[line[9:-11]] = "n"
+    return d
+
+def print_config(op, config, value, new_value):
+    global merge_style
+
+    if merge_style:
+        if new_value:
+            if new_value=="n":
+                print "# CONFIG_%s is not set" % config
+            else:
+                print "CONFIG_%s=%s" % (config, new_value)
+    else:
+        if op=="-":
+            print "-%s %s" % (config, value)
+        elif op=="+":
+            print "+%s %s" % (config, new_value)
+        else:
+            print " %s %s -> %s" % (config, value, new_value)
+
+def main():
+    global merge_style
+
+    # parse command line args
+    if ("-h" in sys.argv or "--help" in sys.argv):
+        usage()
+
+    merge_style = 0
+    if "-m" in sys.argv:
+        merge_style = 1
+        sys.argv.remove("-m")
+
+    argc = len(sys.argv)
+    if not (argc==1 or argc == 3):
+        print "Error: incorrect number of arguments or unrecognized option"
+        usage()
+
+    if argc == 1:
+        # if no filenames given, assume .config and .config.old
+        build_dir=""
+        if os.environ.has_key("KBUILD_OUTPUT"):
+            build_dir = os.environ["KBUILD_OUTPUT"]+"/"
+
+        configa_filename = build_dir + ".config.old"
+        configb_filename = build_dir + ".config"
+    else:
+        configa_filename = sys.argv[1]
+        configb_filename = sys.argv[2]
+
+    a = readconfig(file(configa_filename))
+    b = readconfig(file(configb_filename))
+
+    # print items in a but not b (accumulate, sort and print)
+    old = []
+    for config in a:
+        if config not in b:
+            old.append(config)
+    old.sort()
+    for config in old:
+        print_config("-", config, a[config], None)
+        del a[config]
+
+    # print items that changed (accumulate, sort, and print)
+    changed = []
+    for config in a:
+        if a[config] != b[config]:
+            changed.append(config)
+        else:
+            del b[config]
+    changed.sort()
+    for config in changed:
+        print_config("->", config, a[config], b[config])
+        del b[config]
+
+    # now print items in b but not in a
+    # (items from b that were in a were removed above)
+    new = b.keys()
+    new.sort()
+    for config in new:
+        print_config("+", config, None, b[config])
+
+main()
diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
deleted file mode 100755
index 31598584f871..000000000000
--- a/scripts/hdrcheck.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for FILE in `grep '^[ \t]*#[ \t]*include[ \t]*<' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do
-    if [ ! -r $1/$FILE ]; then
-        echo $2 requires $FILE, which does not exist in exported headers
-        exit 1
-    fi
-done
-# FIXME: List dependencies into $3
-touch $3
diff --git a/scripts/headers.sh b/scripts/headers.sh
new file mode 100755
index 000000000000..d33426f866db
--- /dev/null
+++ b/scripts/headers.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Run headers_$1 command for all suitable architectures
+
+# Stop on error
+set -e
+
+do_command()
+{
+        if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then
+                make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
+        elif [ -f ${srctree}/include/asm-$2/Kbuild ]; then
+                make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
+        else
+                printf "Ignoring arch: %s\n" ${arch}
+        fi
+}
+
+# Do not try this architecture
+drop="generic um ppc sparc64 cris"
+
+archs=$(ls ${srctree}/arch)
+
+for arch in ${archs}; do
+        case ${arch} in
+        um)        # no userspace export
+                ;;
+        ppc)       # headers exported by powerpc
+                ;;
+        sparc64)   # headers exported by sparc
+                ;;
+        cris)      # headers export are known broken
+                ;;
+        *)
+                if [ -d ${srctree}/arch/${arch} ]; then
+                        do_command $1 ${arch}
+                fi
+                ;;
+        esac
+done
+
+
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
new file mode 100644
index 000000000000..15d53a6b1a1f
--- /dev/null
+++ b/scripts/headers_check.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+#
+# headers_check.pl execute a number of trivial consistency checks
+#
+# Usage: headers_check.pl dir [files...]
+# dir:   dir to look for included files
+# arch:  architecture
+# files: list of files to check
+#
+# The script reads the supplied files line by line and:
+#
+# 1) for each include statement it checks if the
+#    included file actually exists.
+#    Only include files located in asm* and linux* are checked.
+#    The rest are assumed to be system include files.
+#
+# 2) TODO: check for leaked CONFIG_ symbols
+
+use strict;
+use warnings;
+
+my ($dir, $arch, @files) = @ARGV;
+
+my $ret = 0;
+my $line;
+my $lineno = 0;
+my $filename;
+
+foreach my $file (@files) {
+        $filename = $file;
+        open(my $fh, '<', "$filename") or die "$filename: $!\n";
+        $lineno = 0;
+        while ($line = <$fh>) {
+                $lineno++;
+                check_include();
+        }
+        close $fh;
+}
+exit $ret;
+
+sub check_include
+{
+        if ($line =~ m/^\s*#\s*include\s+<((asm|linux).*)>/) {
+                my $inc = $1;
+                my $found;
+                $found = stat($dir . "/" . $inc);
+                if (!$found) {
+                        $inc =~ s#asm/#asm-$arch/#;
+                        $found = stat($dir . "/" . $inc);
+                }
+                if (!$found) {
+                        printf STDERR "$filename:$lineno: included file '$inc' is not exported\n";
+                        $ret = 1;
+                }
+        }
+}
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
new file mode 100644
index 000000000000..68591cd08731
--- /dev/null
+++ b/scripts/headers_install.pl
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+#
+# headers_install prepare the listed header files for use in
+# user space and copy the files to their destination.
+#
+# Usage: headers_install.pl readdir installdir arch [files...]
+# readdir:    dir to open files
+# installdir: dir to install the files
+# arch:       current architecture
+#             arch is used to force a reinstallation when the arch
+#             changes because kbuild then detect a command line change.
+# files:      list of files to check
+#
+# Step in preparation for users space:
+# 1) Drop all use of compiler.h definitions
+# 2) Drop include of compiler.h
+# 3) Drop all sections defined out by __KERNEL__ (using unifdef)
+
+use strict;
+use warnings;
+
+my ($readdir, $installdir, $arch, @files) = @ARGV;
+
+my $unifdef = "scripts/unifdef -U__KERNEL__";
+
+foreach my $file (@files) {
+        my $tmpfile = "$installdir/$file.tmp";
+        open(my $infile, '<', "$readdir/$file")
+                or die "$readdir/$file: $!\n";
+        open(my $outfile, '>', "$tmpfile") or die "$tmpfile: $!\n";
+        while (my $line = <$infile>) {
+                $line =~ s/([\s(])__user\s/$1/g;
+                $line =~ s/([\s(])__force\s/$1/g;
+                $line =~ s/([\s(])__iomem\s/$1/g;
+                $line =~ s/\s__attribute_const__\s/ /g;
+                $line =~ s/\s__attribute_const__$//g;
+                $line =~ s/^#include <linux\/compiler.h>//;
+                printf $outfile "%s", $line;
+        }
+        close $outfile;
+        close $infile;
+        system $unifdef . " $tmpfile > $installdir/$file";
+        unlink $tmpfile;
+}
+exit 0;
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index fda63136ae68..9fba838c7069 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -76,7 +76,6 @@ static void check_stdin(void)
 static int conf_askvalue(struct symbol *sym, const char *def)
 {
         enum symbol_type type = sym_get_type(sym);
-        tristate val;
 
         if (!sym_has_value(sym))
                 printf(_("(NEW) "));
@@ -92,15 +91,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         }
 
         switch (input_mode) {
-        case set_no:
-        case set_mod:
-        case set_yes:
-        case set_random:
-                if (sym_has_value(sym)) {
-                        printf("%s\n", def);
-                        return 0;
-                }
-                break;
         case ask_new:
         case ask_silent:
                 if (sym_has_value(sym)) {
@@ -112,9 +102,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
                 fflush(stdout);
                 fgets(line, 128, stdin);
                 return 1;
-        case set_default:
-                printf("%s\n", def);
-                return 1;
         default:
                 break;
         }
@@ -128,52 +115,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         default:
                 ;
         }
-        switch (input_mode) {
-        case set_yes:
-                if (sym_tristate_within_range(sym, yes)) {
-                        line[0] = 'y';
-                        line[1] = '\n';
-                        line[2] = 0;
-                        break;
-                }
-        case set_mod:
-                if (type == S_TRISTATE) {
-                        if (sym_tristate_within_range(sym, mod)) {
-                                line[0] = 'm';
-                                line[1] = '\n';
-                                line[2] = 0;
-                                break;
-                        }
-                } else {
-                        if (sym_tristate_within_range(sym, yes)) {
-                                line[0] = 'y';
-                                line[1] = '\n';
-                                line[2] = 0;
-                                break;
-                        }
-                }
-        case set_no:
-                if (sym_tristate_within_range(sym, no)) {
-                        line[0] = 'n';
-                        line[1] = '\n';
-                        line[2] = 0;
-                        break;
-                }
-        case set_random:
-                do {
-                        val = (tristate)(rand() % 3);
-                } while (!sym_tristate_within_range(sym, val));
-                switch (val) {
-                case no: line[0] = 'n'; break;
-                case mod: line[0] = 'm'; break;
-                case yes: line[0] = 'y'; break;
-                }
-                line[1] = '\n';
-                line[2] = 0;
-                break;
-        default:
-                break;
-        }
         printf("%s", line);
         return 1;
 }
@@ -374,15 +315,7 @@ static int conf_choice(struct menu *menu)
                         else
                                 continue;
                         break;
-                case set_random:
-                        if (is_new)
-                                def = (rand() % cnt) + 1;
-                case set_default:
-                case set_yes:
-                case set_mod:
-                case set_no:
-                        cnt = def;
-                        printf("%d\n", cnt);
+                default:
                         break;
                 }
 
@@ -494,6 +427,43 @@ static void check_conf(struct menu *menu)
                 check_conf(child);
 }
 
+static void conf_do_update(void)
+{
+        /* Update until a loop caused no more changes */
+        do {
+                conf_cnt = 0;
+                check_conf(&rootmenu);
+        } while (conf_cnt);
+}
+
+static int conf_silent_update(void)
+{
+        const char *name;
+
+        if (conf_get_changed()) {
+                name = getenv("KCONFIG_NOSILENTUPDATE");
+                if (name && *name) {
+                        fprintf(stderr,
+                        _("\n*** Kernel configuration requires explicit update.\n\n"));
+                        return 1;
+                }
+                conf_do_update();
+        }
+        return 0;
+}
+
+static int conf_update(void)
+{
+        rootEntry = &rootmenu;
+        conf(&rootmenu);
+        if (input_mode == ask_all) {
+                input_mode = ask_silent;
+                valid_stdin = 1;
+        }
+        conf_do_update();
+        return 0;
+}
+
 int main(int ac, char **av)
 {
         int opt;
@@ -599,36 +569,43 @@ int main(int ac, char **av)
         default:
                 break;
         }
+        switch (input_mode) {
+        case set_no:
+                conf_set_all_new_symbols(def_no);
+                break;
+        case set_yes:
+                conf_set_all_new_symbols(def_yes);
+                break;
+        case set_mod:
+                conf_set_all_new_symbols(def_mod);
+                break;
+        case set_random:
+                conf_set_all_new_symbols(def_random);
+                break;
+        case set_default:
+                conf_set_all_new_symbols(def_default);
+                break;
+        case ask_silent:
+        case ask_new:
+                if (conf_silent_update())
+                        exit(1);
+                break;
+        case ask_all:
+                if (conf_update())
+                        exit(1);
+                break;
+        }
 
-        if (input_mode != ask_silent) {
-                rootEntry = &rootmenu;
-                conf(&rootmenu);
-                if (input_mode == ask_all) {
-                        input_mode = ask_silent;
-                        valid_stdin = 1;
-                }
-        } else if (conf_get_changed()) {
-                name = getenv("KCONFIG_NOSILENTUPDATE");
-                if (name && *name) {
-                        fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
-                        return 1;
-                }
-        } else
-                goto skip_check;
-
-        do {
-                conf_cnt = 0;
-                check_conf(&rootmenu);
-        } while (conf_cnt);
-        if (conf_write(NULL)) {
+        if (conf_get_changed() && conf_write(NULL)) {
                 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
-                return 1;
+                exit(1);
         }
-skip_check:
+        /* ask_silent is used during the build so we shall update autoconf.
+         * All other commands are only used to generate a config.
+         */
         if (input_mode == ask_silent && conf_write_autoconf()) {
                 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
                 return 1;
         }
-
         return 0;
 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ee5fe943d58d..07597611cc50 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -812,3 +812,73 @@ void conf_set_changed_callback(void (*fn)(void))
 {
         conf_changed_callback = fn;
 }
+
+
+void conf_set_all_new_symbols(enum conf_def_mode mode)
+{
+        struct symbol *sym, *csym;
+        struct property *prop;
+        struct expr *e;
+        int i, cnt, def;
+
+        for_all_symbols(i, sym) {
+                if (sym_has_value(sym))
+                        continue;
+                switch (sym_get_type(sym)) {
+                case S_BOOLEAN:
+                case S_TRISTATE:
+                        switch (mode) {
+                        case def_yes:
+                                sym->def[S_DEF_USER].tri = yes;
+                                break;
+                        case def_mod:
+                                sym->def[S_DEF_USER].tri = mod;
+                                break;
+                        case def_no:
+                                sym->def[S_DEF_USER].tri = no;
+                                break;
+                        case def_random:
+                                sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+                                break;
+                        default:
+                                continue;
+                        }
+                        if (!sym_is_choice(sym) || mode != def_random)
+                                sym->flags |= SYMBOL_DEF_USER;
+                        break;
+                default:
+                        break;
+                }
+
+        }
+
+        if (modules_sym)
+                sym_calc_value(modules_sym);
+
+        if (mode != def_random)
+                return;
+
+        for_all_symbols(i, csym) {
+                if (sym_has_value(csym) || !sym_is_choice(csym))
+                        continue;
+
+                sym_calc_value(csym);
+                prop = sym_get_choice_prop(csym);
+                def = -1;
+                while (1) {
+                        cnt = 0;
+                        expr_list_for_each_sym(prop->expr, e, sym) {
+                                if (sym->visible == no)
+                                        continue;
+                                if (def == cnt++) {
+                                        csym->def[S_DEF_USER].val = sym;
+                                        break;
+                                }
+                        }
+                        if (def >= 0 || cnt < 2)
+                                break;
+                        def = (rand() % cnt) + 1;
+                }
+                csym->flags |= SYMBOL_DEF_USER;
+        }
+}
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 96521cb087ec..4a9af6f7886b 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -42,6 +42,14 @@ extern "C" {
 #define TF_PARAM        0x0002
 #define TF_OPTION       0x0004
 
+enum conf_def_mode {
+        def_default,
+        def_yes,
+        def_mod,
+        def_no,
+        def_random
+};
+
 #define T_OPT_MODULES           1
 #define T_OPT_DEFCONFIG_LIST    2
 #define T_OPT_ENV               3
@@ -69,6 +77,7 @@ const char *conf_get_configname(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
+void conf_set_all_new_symbols(enum conf_def_mode mode);
 
 /* kconfig_load.c */
 void kconfig_load(void);
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 88e3934a8b8c..d8f77e26081c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1643,6 +1643,7 @@ sub dump_function($$) {
     $prototype =~ s/^__always_inline +//;
     $prototype =~ s/^noinline +//;
     $prototype =~ s/__devinit +//;
+    $prototype =~ s/__init +//;
     $prototype =~ s/^#define\s+//; #ak added
     $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;
 
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1c1bdaf7348a..83b75126c9f7 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,7 +12,9 @@ cd "${1:-.}" || usage
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
         # Do we have an untagged version?
         if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-                git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+                if tag=`git describe 2>/dev/null`; then
+                        echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+                fi
         fi
 
         # Are there uncommitted changes?
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 87e3aefeddc3..83e90057270e 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -189,9 +189,7 @@ void snd_tea575x_init(struct snd_tea575x *tea)
         }
 
         memset(&tea->vd, 0, sizeof(tea->vd));
-        tea->vd.owner = tea->card->module;
         strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio");
-        tea->vd.type = VID_TYPE_TUNER;
         tea->vd.release = snd_tea575x_release;
         video_set_drvdata(&tea->vd, tea);
         tea->vd.fops = &tea->fops;
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index dbe63db4bfd6..4d4b8ddc26ba 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -325,6 +325,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard,
                                          struct pnp_dev *pdev)
 {
+        acard->wss = pdev;
         if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)
                 return -EBUSY;
         cport[dev] = -1;
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 41c047e665ec..0797ca441a37 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -68,7 +68,9 @@ MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)},"
 static int index = SNDRV_DEFAULT_IDX1;  /* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;           /* ID for this card */
 //static int enable = SNDRV_DEFAULT_ENABLE1;    /* Enable this card */
+#ifdef CONFIG_PNP
 static int isapnp = 1;                  /* Enable ISA PnP detection */
+#endif
 static long port = SNDRV_DEFAULT_PORT1;         /* 0x530,0xe80,0xf40,0x604 */
 static long mpu_port = SNDRV_DEFAULT_PORT1;     /* 0x300,0x310,0x320,0x330 */
 static long fm_port = SNDRV_DEFAULT_PORT1;      /* 0x388 */
@@ -85,8 +87,10 @@ module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard.");
 //module_param(enable, bool, 0444);
 //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard.");
+#ifdef CONFIG_PNP
 module_param(isapnp, bool, 0444);
 MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");
+#endif
 module_param(port, long, 0444);
 MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");
 module_param(mpu_port, long, 0444);
@@ -688,7 +692,7 @@ static void snd_card_opti9xx_free(struct snd_card *card)
         if (chip) {
 #ifdef OPTi93X
                 struct snd_cs4231 *codec = chip->codec;
-                if (codec->irq > 0) {
+                if (codec && codec->irq > 0) {
                         disable_irq(codec->irq);
                         free_irq(codec->irq, codec);
                 }
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 07364c00768a..8c49a00a5e39 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -161,6 +161,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x50534304, 0xffffffff, "UCB1400",            patch_ucb1400,  NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
 { 0x54524102, 0xffffffff, "TR28022",            NULL,           NULL },
+{ 0x54524103, 0xffffffff, "TR28023",            NULL,           NULL },
 { 0x54524106, 0xffffffff, "TR28026",            NULL,           NULL },
 { 0x54524108, 0xffffffff, "TR28028",            patch_tritech_tr28028,  NULL }, // added by xin jin [07/09/99]
 { 0x54524123, 0xffffffff, "TR28602",            NULL,           NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]
@@ -169,7 +170,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x56494170, 0xffffffff, "VIA1617A",           patch_vt1617a,  NULL }, // modified VT1616 with S/PDIF
 { 0x56494182, 0xffffffff, "VIA1618",            NULL,           NULL },
 { 0x57454301, 0xffffffff, "W83971D",            NULL,           NULL },
-{ 0x574d4c00, 0xffffffff, "WM9701A",            NULL,           NULL },
+{ 0x574d4c00, 0xffffffff, "WM9701,WM9701A",     NULL,           NULL },
 { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL},
 { 0x574d4C04, 0xffffffff, "WM9704M,WM9704Q",    patch_wolfson04, NULL},
 { 0x574d4C05, 0xffffffff, "WM9705,WM9710",      patch_wolfson05, NULL},
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 0746e9ccc20b..f4fbc795ee81 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -3381,8 +3381,8 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
 }
 
 /* create a virtual master control and add slaves */
-int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
-                         const unsigned int *tlv, const char **slaves)
+static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
+                                const unsigned int *tlv, const char **slaves)
 {
         struct snd_kcontrol *kctl;
         const char **s;
diff --git a/sound/pci/azt3328.h b/sound/pci/azt3328.h
index 7e3e8942d073..974e05122f00 100644
--- a/sound/pci/azt3328.h
+++ b/sound/pci/azt3328.h
@@ -94,7 +94,7 @@ enum azf_freq_t {
   AZF_FREQ(48000),
   AZF_FREQ(66200),
 #undef AZF_FREQ
-} AZF_FREQUENCIES;
+};
 
 /** recording area (see also: playback bit flag definitions) **/
 #define IDX_IO_REC_FLAGS        0x20 /* ??, PU:0x0000 */
@@ -210,7 +210,7 @@ enum azf_freq_t {
 
 enum {
         AZF_GAME_LEGACY_IO_PORT = 0x200
-} AZF_GAME_CONFIGS;
+};
 
 #define IDX_GAME_LEGACY_COMPATIBLE      0x00
         /* in some operation mode, writing anything to this port
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index fbf1124f7c79..9bf95367c882 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -522,7 +522,7 @@ static unsigned int snd_es1371_wait_src_ready(struct ensoniq * ensoniq)
                         return r;
                 cond_resched();
         }
-        snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n",
+        snd_printk(KERN_ERR "wait src ready timeout 0x%lx [0x%x]\n",
                    ES_REG(ensoniq, 1371_SMPRATE), r);
         return 0;
 }
@@ -1629,6 +1629,7 @@ static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = ensoniq;
         ac97.private_free = snd_ensoniq_mixer_free_ac97;
+        ac97.pci = ensoniq->pci;
         ac97.scaps = AC97_SCAP_AUDIO;
         if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
                 return err;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 16715a68ba5e..ef9f072b47fc 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1047,9 +1047,13 @@ static int azx_setup_periods(struct azx *chip,
         pos_adj = bdl_pos_adj[chip->dev_index];
         if (pos_adj > 0) {
                 struct snd_pcm_runtime *runtime = substream->runtime;
+                int pos_align = pos_adj;
                 pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
                 if (!pos_adj)
-                        pos_adj = 1;
+                        pos_adj = pos_align;
+                else
+                        pos_adj = ((pos_adj + pos_align - 1) / pos_align) *
+                                pos_align;
                 pos_adj = frames_to_bytes(runtime, pos_adj);
                 if (pos_adj >= period_bytes) {
                         snd_printk(KERN_WARNING "Too big adjustment %d\n",
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2807bc840d26..add4e87e0b20 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -122,6 +122,8 @@ enum {
 /* ALC269 models */
 enum {
         ALC269_BASIC,
+        ALC269_ASUS_EEEPC_P703,
+        ALC269_ASUS_EEEPC_P901,
         ALC269_AUTO,
         ALC269_MODEL_LAST /* last tag */
 };
@@ -7905,6 +7907,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE), 
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
         SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
@@ -10946,7 +10949,23 @@ static int patch_alc268(struct hda_codec *codec)
 
 static hda_nid_t alc269_adc_nids[1] = {
         /* ADC1 */
-        0x07,
+        0x08,
+};
+
+static struct hda_input_mux alc269_eeepc_dmic_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "i-Mic", 0x5 },
+                { "e-Mic", 0x0 },
+        },
+};
+
+static struct hda_input_mux alc269_eeepc_amic_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "i-Mic", 0x1 },
+                { "e-Mic", 0x0 },
+        },
 };
 
 #define alc269_modes            alc260_modes
@@ -10968,10 +10987,27 @@ static struct snd_kcontrol_new alc269_base_mixer[] = {
         { } /* end */
 };
 
+/* bind volumes of both NID 0x0c and 0x0d */
+static struct hda_bind_ctls alc269_epc_bind_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
+
+static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
+        HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        HDA_BIND_VOL("LineOut Playback Volume", &alc269_epc_bind_vol),
+        HDA_CODEC_MUTE("LineOut Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        { } /* end */
+};
+
 /* capture mixer elements */
 static struct snd_kcontrol_new alc269_capture_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
@@ -10987,6 +11023,13 @@ static struct snd_kcontrol_new alc269_capture_mixer[] = {
         { } /* end */
 };
 
+/* capture mixer elements */
+static struct snd_kcontrol_new alc269_epc_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -10994,7 +11037,7 @@ static struct hda_verb alc269_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
         /* Mute input amps (PCBeep, Line In, Mic 1 & Mic 2) of the
          * analog-loopback mixer widget
@@ -11057,6 +11100,98 @@ static struct hda_verb alc269_init_verbs[] = {
         { }
 };
 
+static struct hda_verb alc269_eeepc_dmic_init_verbs[] = {
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x23, AC_VERB_SET_CONNECT_SEL, 0x05},
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 << 8))},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {}
+};
+
+static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x23, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x701b | (0x00 << 8))},
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {}
+};
+
+/* toggle speaker-output according to the hp-jack state */
+static void alc269_speaker_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+        unsigned int bits;
+
+        present = snd_hda_codec_read(codec, 0x15, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        bits = present ? AMP_IN_MUTE(0) : 0;
+        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
+                                 AMP_IN_MUTE(0), bits);
+        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
+                                 AMP_IN_MUTE(0), bits);
+}
+
+static void alc269_eeepc_dmic_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_codec_read(codec, 0x18, 0, AC_VERB_GET_PIN_SENSE, 0)
+                & AC_PINSENSE_PRESENCE;
+        snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_CONNECT_SEL,
+                            present ? 0 : 5);
+}
+
+static void alc269_eeepc_amic_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_codec_read(codec, 0x18, 0, AC_VERB_GET_PIN_SENSE, 0)
+                & AC_PINSENSE_PRESENCE;
+        snd_hda_codec_write(codec, 0x24, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            present ? AMP_IN_UNMUTE(0) : AMP_IN_MUTE(0));
+        snd_hda_codec_write(codec, 0x24, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            present ? AMP_IN_MUTE(1) : AMP_IN_UNMUTE(1));
+}
+
+/* unsolicited event for HP jack sensing */
+static void alc269_eeepc_dmic_unsol_event(struct hda_codec *codec,
+                                          unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc269_speaker_automute(codec);
+
+        if ((res >> 26) == ALC880_MIC_EVENT)
+                alc269_eeepc_dmic_automute(codec);
+}
+
+static void alc269_eeepc_dmic_inithook(struct hda_codec *codec)
+{
+        alc269_speaker_automute(codec);
+        alc269_eeepc_dmic_automute(codec);
+}
+
+/* unsolicited event for HP jack sensing */
+static void alc269_eeepc_amic_unsol_event(struct hda_codec *codec,
+                                          unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc269_speaker_automute(codec);
+
+        if ((res >> 26) == ALC880_MIC_EVENT)
+                alc269_eeepc_amic_automute(codec);
+}
+
+static void alc269_eeepc_amic_inithook(struct hda_codec *codec)
+{
+        alc269_speaker_automute(codec);
+        alc269_eeepc_amic_automute(codec);
+}
+
 /* add playback controls from the parsed DAC table */
 static int alc269_auto_create_multi_out_ctls(struct alc_spec *spec,
                                              const struct auto_pin_cfg *cfg)
@@ -11188,6 +11323,9 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
+        spec->mixers[spec->num_mixers] = alc269_capture_mixer;
+        spec->num_mixers++;
+
         return 1;
 }
 
@@ -11215,12 +11353,16 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
 };
 
 static struct snd_pci_quirk alc269_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
+                      ALC269_ASUS_EEEPC_P703),
+        SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",
+                      ALC269_ASUS_EEEPC_P901),
         {}
 };
 
 static struct alc_config_preset alc269_presets[] = {
         [ALC269_BASIC] = {
-                .mixers = { alc269_base_mixer },
+                .mixers = { alc269_base_mixer, alc269_capture_mixer },
                 .init_verbs = { alc269_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc269_dac_nids),
                 .dac_nids = alc269_dac_nids,
@@ -11229,6 +11371,32 @@ static struct alc_config_preset alc269_presets[] = {
                 .channel_mode = alc269_modes,
                 .input_mux = &alc269_capture_source,
         },
+        [ALC269_ASUS_EEEPC_P703] = {
+                .mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer },
+                .init_verbs = { alc269_init_verbs,
+                                alc269_eeepc_amic_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc269_dac_nids),
+                .dac_nids = alc269_dac_nids,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc269_modes),
+                .channel_mode = alc269_modes,
+                .input_mux = &alc269_eeepc_amic_capture_source,
+                .unsol_event = alc269_eeepc_amic_unsol_event,
+                .init_hook = alc269_eeepc_amic_inithook,
+        },
+        [ALC269_ASUS_EEEPC_P901] = {
+                .mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer},
+                .init_verbs = { alc269_init_verbs,
+                                alc269_eeepc_dmic_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc269_dac_nids),
+                .dac_nids = alc269_dac_nids,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc269_modes),
+                .channel_mode = alc269_modes,
+                .input_mux = &alc269_eeepc_dmic_capture_source,
+                .unsol_event = alc269_eeepc_dmic_unsol_event,
+                .init_hook = alc269_eeepc_dmic_inithook,
+        },
 };
 
 static int patch_alc269(struct hda_codec *codec)
@@ -11282,8 +11450,6 @@ static int patch_alc269(struct hda_codec *codec)
 
         spec->adc_nids = alc269_adc_nids;
         spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
-        spec->mixers[spec->num_mixers] = alc269_capture_mixer;
-        spec->num_mixers++;
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC269_AUTO)
@@ -12994,6 +13160,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),
         SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),
         SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),
+        SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC861VD_LENOVO),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),
         SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),
         SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 08cb77f51880..7fdafcb0015d 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -94,6 +94,9 @@ enum {
         STAC_INTEL_MAC_V3,
         STAC_INTEL_MAC_V4,
         STAC_INTEL_MAC_V5,
+        STAC_INTEL_MAC_AUTO, /* This model is selected if no module parameter
+                              * is given, one of the above models will be
+                              * chosen according to the subsystem id. */
         /* for backward compatibility */
         STAC_MACMINI,
         STAC_MACBOOK,
@@ -1483,6 +1486,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
         [STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs,
         [STAC_INTEL_MAC_V4] = intel_mac_v4_pin_configs,
         [STAC_INTEL_MAC_V5] = intel_mac_v5_pin_configs,
+        [STAC_INTEL_MAC_AUTO] = intel_mac_v3_pin_configs,
         /* for backward compatibility */
         [STAC_MACMINI] = intel_mac_v3_pin_configs,
         [STAC_MACBOOK] = intel_mac_v5_pin_configs,
@@ -1505,6 +1509,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
         [STAC_INTEL_MAC_V3] = "intel-mac-v3",
         [STAC_INTEL_MAC_V4] = "intel-mac-v4",
         [STAC_INTEL_MAC_V5] = "intel-mac-v5",
+        [STAC_INTEL_MAC_AUTO] = "intel-mac-auto",
         /* for backward compatibility */
         [STAC_MACMINI]  = "macmini",
         [STAC_MACBOOK]  = "macbook",
@@ -1576,9 +1581,9 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0707,
                       "Intel D945P", STAC_D945GTP5),
         /* other systems  */
-        /* Apple Mac Mini (early 2006) */
+        /* Apple Intel Mac (Mac Mini, MacBook, MacBook Pro...) */
         SND_PCI_QUIRK(0x8384, 0x7680,
-                      "Mac Mini", STAC_INTEL_MAC_V3),
+                      "Mac", STAC_INTEL_MAC_AUTO),
         /* Dell systems  */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,
                       "unknown Dell", STAC_922X_DELL_D81),
@@ -3725,7 +3730,7 @@ static int patch_stac922x(struct hda_codec *codec)
         spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
                                                         stac922x_models,
                                                         stac922x_cfg_tbl);
-        if (spec->board_config == STAC_INTEL_MAC_V3) {
+        if (spec->board_config == STAC_INTEL_MAC_AUTO) {
                 spec->gpio_mask = spec->gpio_dir = 0x03;
                 spec->gpio_data = 0x03;
                 /* Intel Macs have all same PCI SSID, so we need to check
@@ -3757,6 +3762,9 @@ static int patch_stac922x(struct hda_codec *codec)
                 case 0x106b2200:
                         spec->board_config = STAC_INTEL_MAC_V5;
                         break;
+                default:
+                        spec->board_config = STAC_INTEL_MAC_V3;
+                        break;
                 }
         }
 
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index ba4b5c199f21..9384702c7ebd 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -231,7 +231,7 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype)
 
         /* if both TX and RX are idle, disable PSC */
         stat = au_readl(I2S_STAT(pscdata));
-        if (!(stat & (PSC_I2SSTAT_RB | PSC_I2SSTAT_RB))) {
+        if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
                 au_writel(0, I2S_CFG(pscdata));
                 au_sync();
                 au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 9fc8edd82225..1fb7f9a7aecd 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -427,20 +427,20 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"HPOUTR", NULL, "Headphone PGA"},
         {"Headphone PGA", NULL, "Right HP Mixer"},
 
-        /* mono hp mixer */
-        {"Mono HP Mixer", NULL, "Left HP Mixer"},
-        {"Mono HP Mixer", NULL, "Right HP Mixer"},
+        /* mono mixer */
+        {"Mono Mixer", NULL, "Left HP Mixer"},
+        {"Mono Mixer", NULL, "Right HP Mixer"},
 
         /* Out3 Mux */
         {"Out3 Mux", "Left", "Left HP Mixer"},
         {"Out3 Mux", "Mono", "Phone Mixer"},
-        {"Out3 Mux", "Left + Right", "Mono HP Mixer"},
+        {"Out3 Mux", "Left + Right", "Mono Mixer"},
         {"Out 3 PGA", NULL, "Out3 Mux"},
         {"OUT3", NULL, "Out 3 PGA"},
 
         /* speaker Mux */
         {"Speaker Mux", "Speaker Mix", "Speaker Mixer"},
-        {"Speaker Mux", "Headphone Mix", "Mono HP Mixer"},
+        {"Speaker Mux", "Headphone Mix", "Mono Mixer"},
         {"Speaker PGA", NULL, "Speaker Mux"},
         {"LOUT2", NULL, "Speaker PGA"},
         {"ROUT2", NULL, "Speaker PGA"},
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2c87061c2a6b..820347c9ae4b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -523,24 +523,6 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                                 continue;
                         }
 
-                        /* programmable gain/attenuation */
-                        if (w->id == snd_soc_dapm_pga) {
-                                int on;
-                                in = is_connected_input_ep(w);
-                                dapm_clear_walk(w->codec);
-                                out = is_connected_output_ep(w);
-                                dapm_clear_walk(w->codec);
-                                w->power = on = (out != 0 && in != 0) ? 1 : 0;
-
-                                if (!on)
-                                        dapm_set_pga(w, on); /* lower volume to reduce pops */
-                                dapm_update_bits(w);
-                                if (on)
-                                        dapm_set_pga(w, on); /* restore volume from zero */
-
-                                continue;
-                        }
-
                         /* pre and post event widgets */
                         if (w->id == snd_soc_dapm_pre) {
                                 if (!w->event)
@@ -586,45 +568,56 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         power_change = (w->power == power) ? 0: 1;
                         w->power = power;
 
+                        if (!power_change)
+                                continue;
+
                         /* call any power change event handlers */
-                        if (power_change) {
-                                if (w->event) {
-                                        pr_debug("power %s event for %s flags %x\n",
-                                                 w->power ? "on" : "off", w->name, w->event_flags);
-                                        if (power) {
-                                                /* power up event */
-                                                if (w->event_flags & SND_SOC_DAPM_PRE_PMU) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_PRE_PMU);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                                dapm_update_bits(w);
-                                                if (w->event_flags & SND_SOC_DAPM_POST_PMU){
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_POST_PMU);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                        } else {
-                                                /* power down event */
-                                                if (w->event_flags & SND_SOC_DAPM_PRE_PMD) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_PRE_PMD);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                                dapm_update_bits(w);
-                                                if (w->event_flags & SND_SOC_DAPM_POST_PMD) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_POST_PMD);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                        }
-                                } else
-                                        /* no event handler */
-                                        dapm_update_bits(w);
+                        if (w->event)
+                                pr_debug("power %s event for %s flags %x\n",
+                                         w->power ? "on" : "off",
+                                         w->name, w->event_flags);
+
+                        /* power up pre event */
+                        if (power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_PRE_PMU)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* power down pre event */
+                        if (!power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_PRE_PMD)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* Lower PGA volume to reduce pops */
+                        if (w->id == snd_soc_dapm_pga && !power)
+                                dapm_set_pga(w, power);
+
+                        dapm_update_bits(w);
+
+                        /* Raise PGA volume to reduce pops */
+                        if (w->id == snd_soc_dapm_pga && power)
+                                dapm_set_pga(w, power);
+
+                        /* power up post event */
+                        if (power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
+                                ret = w->event(w,
+                                               NULL, SND_SOC_DAPM_POST_PMU);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* power down post event */
+                        if (!power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_POST_PMD)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD);
+                                if (ret < 0)
+                                        return ret;
                         }
                 }
         }