Merge branch 'upstream-fixes' into upstream

author: Jeff Garzik <jeff@garzik.org> 2006-08-03 17:35:48 -0400
committer: Jeff Garzik <jeff@garzik.org> 2006-08-03 17:35:48 -0400
commit: 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch)
tree: c5b52547b2658a8a3b898b8224b835a7e8396017 /drivers
parent: 95916edd02e3a7752315422f386c55723d4a3637 (diff)
parent: f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff)
107 files changed, 1536 insertions, 938 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index c2d621632383..3ef9d514b916 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -139,7 +139,7 @@ static int __cpuinit topology_sysfs_init(void)
                                (void *)(long)i);
        }
-        register_cpu_notifier(&topology_cpu_notifier);
+        register_hotcpu_notifier(&topology_cpu_notifier);
        return 0;
 }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 0a1b1ea36ddc..bdbade9a5cf5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -300,6 +300,15 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
                                lo->disk->disk_name, result);
                goto harderror;
        }
+        if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
+                printk(KERN_ERR "%s: Wrong magic (0x%lx)\n",
+                                lo->disk->disk_name,
+                                (unsigned long)ntohl(reply.magic));
+                result = -EPROTO;
+                goto harderror;
+        }
        req = nbd_find_request(lo, reply.handle);
        if (unlikely(IS_ERR(req))) {
                result = PTR_ERR(req);
@@ -312,13 +321,6 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
                goto harderror;
        }
-        if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
-                printk(KERN_ERR "%s: Wrong magic (0x%lx)\n",
-                                lo->disk->disk_name,
-                                (unsigned long)ntohl(reply.magic));
-                result = -EPROTO;
-                goto harderror;
-        }
        if (ntohl(reply.error)) {
                printk(KERN_ERR "%s: Other side returned error (%d)\n",
                                lo->disk->disk_name, ntohl(reply.error));
@@ -339,7 +341,8 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
                                        printk(KERN_ERR "%s: Receive data failed (result %d)\n",
                                                        lo->disk->disk_name,
                                                        result);
-                                        goto harderror;
+                                        req->errors++;
+                                        return req;
                                }
                                dprintk(DBG_RX, "%s: request %p: got %d bytes data\n",
                                        lo->disk->disk_name, req, bvec->bv_len);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index bde2c64b6346..451b996bba91 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2577,19 +2577,19 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm
        case PKT_CTRL_CMD_SETUP:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-                mutex_lock(&ctl_mutex);
+                mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
                ret = pkt_setup_dev(&ctrl_cmd);
                mutex_unlock(&ctl_mutex);
                break;
        case PKT_CTRL_CMD_TEARDOWN:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-                mutex_lock(&ctl_mutex);
+                mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
                ret = pkt_remove_dev(&ctrl_cmd);
                mutex_unlock(&ctl_mutex);
                break;
        case PKT_CTRL_CMD_STATUS:
-                mutex_lock(&ctl_mutex);
+                mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
                pkt_get_status(&ctrl_cmd);
                mutex_unlock(&ctl_mutex);
                break;
diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
index be61f22ee7bb..d37ced0d132b 100644
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
@@ -107,10 +107,14 @@ found:
        if (err) {
                printk(KERN_ERR PFX "RNG registering failed (%d)\n",
                       err);
-                goto out;
+                goto err_unmap;
        }
 out:
        return err;
+err_unmap:
+        iounmap(mem);
+        goto out;
 }
 static void __exit mod_exit(void)
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index 6594bd5645f4..ccd7e7102234 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -164,7 +164,7 @@ static int __init mod_init(void)
        if (err) {
                printk(KERN_ERR PFX "RNG registering failed (%d)\n",
                       err);
-                goto out;
+                goto err_unmap;
        }
 out:
        return err;
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 645eb81cb5a9..84e5a68635f1 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -221,7 +221,6 @@ static struct nsc_gpio_ops pc8736x_gpio_ops = {
        .gpio_change    = pc8736x_gpio_change,
        .gpio_current   = pc8736x_gpio_current
 };
-EXPORT_SYMBOL(pc8736x_gpio_ops);
 static int pc8736x_gpio_open(struct inode *inode, struct file *file)
 {
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 498aa37bca22..3ece69231343 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -51,6 +51,7 @@ void proc_fork_connector(struct task_struct *task)
        struct cn_msg *msg;
        struct proc_event *ev;
        __u8 buffer[CN_PROC_MSG_SIZE];
+        struct timespec ts;
        if (atomic_read(&proc_event_num_listeners) < 1)
                return;
@@ -58,7 +59,8 @@ void proc_fork_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
-        ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        ev->timestamp_ns = timespec_to_ns(&ts);
        ev->what = PROC_EVENT_FORK;
        ev->event_data.fork.parent_pid = task->real_parent->pid;
        ev->event_data.fork.parent_tgid = task->real_parent->tgid;
@@ -76,6 +78,7 @@ void proc_exec_connector(struct task_struct *task)
 {
        struct cn_msg *msg;
        struct proc_event *ev;
+        struct timespec ts;
        __u8 buffer[CN_PROC_MSG_SIZE];
        if (atomic_read(&proc_event_num_listeners) < 1)
@@ -84,7 +87,8 @@ void proc_exec_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
-        ktime_get_ts(&ev->timestamp);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        ev->timestamp_ns = timespec_to_ns(&ts);
        ev->what = PROC_EVENT_EXEC;
        ev->event_data.exec.process_pid = task->pid;
        ev->event_data.exec.process_tgid = task->tgid;
@@ -100,6 +104,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
        struct cn_msg *msg;
        struct proc_event *ev;
        __u8 buffer[CN_PROC_MSG_SIZE];
+        struct timespec ts;
        if (atomic_read(&proc_event_num_listeners) < 1)
                return;
@@ -118,7 +123,8 @@ void proc_id_connector(struct task_struct *task, int which_id)
        } else
                return;
        get_seq(&msg->seq, &ev->cpu);
-        ktime_get_ts(&ev->timestamp);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        ev->timestamp_ns = timespec_to_ns(&ts);
        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
        msg->ack = 0; /* not used */
@@ -131,6 +137,7 @@ void proc_exit_connector(struct task_struct *task)
        struct cn_msg *msg;
        struct proc_event *ev;
        __u8 buffer[CN_PROC_MSG_SIZE];
+        struct timespec ts;
        if (atomic_read(&proc_event_num_listeners) < 1)
                return;
@@ -138,7 +145,8 @@ void proc_exit_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
-        ktime_get_ts(&ev->timestamp);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        ev->timestamp_ns = timespec_to_ns(&ts);
        ev->what = PROC_EVENT_EXIT;
        ev->event_data.exit.process_pid = task->pid;
        ev->event_data.exit.process_tgid = task->tgid;
@@ -164,6 +172,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
        struct cn_msg *msg;
        struct proc_event *ev;
        __u8 buffer[CN_PROC_MSG_SIZE];
+        struct timespec ts;
        if (atomic_read(&proc_event_num_listeners) < 1)
                return;
@@ -171,7 +180,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        msg->seq = rcvd_seq;
-        ktime_get_ts(&ev->timestamp);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        ev->timestamp_ns = timespec_to_ns(&ts);
        ev->cpu = -1;
        ev->what = PROC_EVENT_NONE;
        ev->event_data.ack.err = err;
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index d1266fe2d1ab..b6fb167e20f6 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -682,6 +682,7 @@ config BLK_DEV_SVWKS
 config BLK_DEV_SGIIOC4
        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
+        select IDEPCI_SHARE_IRQ
        help
          This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
          chipset, which has one channel and can support two devices.
@@ -773,20 +774,6 @@ config BLK_DEV_IDEDMA_PMAC
          to transfer data to and from memory.  Saying Y is safe and improves
          performance.
-config BLK_DEV_IDE_PMAC_BLINK
-        bool "Blink laptop LED on drive activity (DEPRECATED)"
-        depends on BLK_DEV_IDE_PMAC && ADB_PMU
-        select ADB_PMU_LED
-        select LEDS_TRIGGERS
-        select LEDS_TRIGGER_IDE_DISK
-        help
-          This option enables the use of the sleep LED as a hard drive
-          activity LED.
-          This option is deprecated, it only selects ADB_PMU_LED and
-          LEDS_TRIGGER_IDE_DISK and changes the code in the new led class
-          device to default to the ide-disk trigger (which should be set
-          from userspace via sysfs).
 config BLK_DEV_IDE_SWARM
        tristate "IDE for Sibyte evaluation boards"
        depends on SIBYTE_SB1xxx_SOC
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 657165297dc7..77703acaec17 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -23,6 +23,7 @@
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/bitops.h>
+#include <linux/nmi.h>
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -1243,6 +1244,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
                if (stat == 0xff)
                        return -ENODEV;
                touch_softlockup_watchdog();
+                touch_nmi_watchdog();
        }
        return -EBUSY;
 }
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index d294bbc42f09..1205e8027829 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -35,6 +35,7 @@
 #include <net/arp.h>
 #include <net/neighbour.h>
 #include <net/route.h>
+#include <net/netevent.h>
 #include <rdma/ib_addr.h>
 MODULE_AUTHOR("Sean Hefty");
@@ -326,25 +327,22 @@ void rdma_addr_cancel(struct rdma_dev_addr *addr)
 }
 EXPORT_SYMBOL(rdma_addr_cancel);
-static int addr_arp_recv(struct sk_buff *skb, struct net_device *dev,
+static int netevent_callback(struct notifier_block *self, unsigned long event, 
-                         struct packet_type *pkt, struct net_device *orig_dev)
+        void *ctx)
 {
-        struct arphdr *arp_hdr;
+        if (event == NETEVENT_NEIGH_UPDATE) {  
+                struct neighbour *neigh = ctx;
-        arp_hdr = (struct arphdr *) skb->nh.raw;
+                if (neigh->dev->type == ARPHRD_INFINIBAND &&
+                    (neigh->nud_state & NUD_VALID)) {
-        if (arp_hdr->ar_op == htons(ARPOP_REQUEST) ||
+                        set_timeout(jiffies);
-            arp_hdr->ar_op == htons(ARPOP_REPLY))
+                }
-                set_timeout(jiffies);
+        }
-        kfree_skb(skb);
        return 0;
 }
-static struct packet_type addr_arp = {
+static struct notifier_block nb = {
-        .type           = __constant_htons(ETH_P_ARP),
+        .notifier_call = netevent_callback
-        .func           = addr_arp_recv,
-        .af_packet_priv = (void*) 1,
 };
 static int addr_init(void)
@@ -353,13 +351,13 @@ static int addr_init(void)
        if (!addr_wq)
                return -ENOMEM;
-        dev_add_pack(&addr_arp);
+        register_netevent_notifier(&nb);
        return 0;
 }
 static void addr_cleanup(void)
 {
-        dev_remove_pack(&addr_arp);
+        unregister_netevent_notifier(&nb);
        destroy_workqueue(addr_wq);
 }
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index f85c97f7500a..0de335b7bfc2 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -975,8 +975,10 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
        cm_id_priv->timewait_info = cm_create_timewait_info(cm_id_priv->
                                                            id.local_id);
-        if (IS_ERR(cm_id_priv->timewait_info))
+        if (IS_ERR(cm_id_priv->timewait_info)) {
+                ret = PTR_ERR(cm_id_priv->timewait_info);
                goto out;
+        }
        ret = cm_init_av_by_path(param->primary_path, &cm_id_priv->av);
        if (ret)
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index bb9bee56a824..102a59c033ff 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -42,6 +42,7 @@
 #include <linux/kref.h>
 #include <linux/idr.h>
 #include <linux/mutex.h>
+#include <linux/completion.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_user_verbs.h>
@@ -69,6 +70,7 @@
 struct ib_uverbs_device {
        struct kref                             ref;
+        struct completion                       comp;
        int                                     devnum;
        struct cdev                            *dev;
        struct class_device                    *class_dev;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index e725cccc7cde..4e16314e8e6d 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -122,7 +122,7 @@ static void ib_uverbs_release_dev(struct kref *ref)
        struct ib_uverbs_device *dev =
                container_of(ref, struct ib_uverbs_device, ref);
-        kfree(dev);
+        complete(&dev->comp);
 }
 void ib_uverbs_release_ucq(struct ib_uverbs_file *file,
@@ -740,6 +740,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
                return;
        kref_init(&uverbs_dev->ref);
+        init_completion(&uverbs_dev->comp);
        spin_lock(&map_lock);
        uverbs_dev->devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES);
@@ -793,6 +794,8 @@ err_cdev:
 err:
        kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);
+        wait_for_completion(&uverbs_dev->comp);
+        kfree(uverbs_dev);
        return;
 }
@@ -812,7 +815,10 @@ static void ib_uverbs_remove_one(struct ib_device *device)
        spin_unlock(&map_lock);
        clear_bit(uverbs_dev->devnum, dev_map);
        kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);
+        wait_for_completion(&uverbs_dev->comp);
+        kfree(uverbs_dev);
 }
 static int uverbs_event_get_sb(struct file_system_type *fs_type, int flags,
diff --git a/drivers/infiniband/hw/mthca/mthca_allocator.c b/drivers/infiniband/hw/mthca/mthca_allocator.c
index 9ba3211cef7c..25157f57a6d0 100644
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
@@ -108,14 +108,15 @@ void mthca_alloc_cleanup(struct mthca_alloc *alloc)
 * serialize access to the array.
 */
+#define MTHCA_ARRAY_MASK (PAGE_SIZE / sizeof (void *) - 1)
 void *mthca_array_get(struct mthca_array *array, int index)
 {
        int p = (index * sizeof (void *)) >> PAGE_SHIFT;
-        if (array->page_list[p].page) {
+        if (array->page_list[p].page)
-                int i = index & (PAGE_SIZE / sizeof (void *) - 1);
+                return array->page_list[p].page[index & MTHCA_ARRAY_MASK];
-                return array->page_list[p].page[i];
+        else
-        } else
                return NULL;
 }
@@ -130,8 +131,7 @@ int mthca_array_set(struct mthca_array *array, int index, void *value)
        if (!array->page_list[p].page)
                return -ENOMEM;
-        array->page_list[p].page[index & (PAGE_SIZE / sizeof (void *) - 1)] =
+        array->page_list[p].page[index & MTHCA_ARRAY_MASK] = value;
-                value;
        ++array->page_list[p].used;
        return 0;
@@ -144,7 +144,8 @@ void mthca_array_clear(struct mthca_array *array, int index)
        if (--array->page_list[p].used == 0) {
                free_page((unsigned long) array->page_list[p].page);
                array->page_list[p].page = NULL;
-        }
+        } else
+                array->page_list[p].page[index & MTHCA_ARRAY_MASK] = NULL;
        if (array->page_list[p].used < 0)
                pr_debug("Array %p index %d page %d with ref count %d < 0\n",
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index 13d6d01c72c0..d74653d7de1c 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -6,8 +6,7 @@ config INFINIBAND_IPOIB
          transports IP packets over InfiniBand so you can use your IB
          device as a fancy NIC.
-          The IPoIB protocol is defined by the IETF ipoib working
+          See Documentation/infiniband/ipoib.txt for more information
-          group: <http://www.ietf.org/html.charters/ipoib-charter.html>.
 config INFINIBAND_IPOIB_DEBUG
        bool "IP-over-InfiniBand debugging" if EMBEDDED
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 8f472e7113b4..8257d5a2c8f8 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -77,6 +77,14 @@ MODULE_PARM_DESC(topspin_workarounds,
 static const u8 topspin_oui[3] = { 0x00, 0x05, 0xad };
+static int mellanox_workarounds = 1;
+module_param(mellanox_workarounds, int, 0444);
+MODULE_PARM_DESC(mellanox_workarounds,
+                 "Enable workarounds for Mellanox SRP target bugs if != 0");
+static const u8 mellanox_oui[3] = { 0x00, 0x02, 0xc9 };
 static void srp_add_one(struct ib_device *device);
 static void srp_remove_one(struct ib_device *device);
 static void srp_completion(struct ib_cq *cq, void *target_ptr);
@@ -526,8 +534,10 @@ static int srp_reconnect_target(struct srp_target_port *target)
        while (ib_poll_cq(target->cq, 1, &wc) > 0)
                ; /* nothing */
+        spin_lock_irq(target->scsi_host->host_lock);
        list_for_each_entry_safe(req, tmp, &target->req_queue, list)
                srp_reset_req(target, req);
+        spin_unlock_irq(target->scsi_host->host_lock);
        target->rx_head  = 0;
        target->tx_head  = 0;
@@ -567,7 +577,7 @@ err:
        return ret;
 }
-static int srp_map_fmr(struct srp_device *dev, struct scatterlist *scat,
+static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
                       int sg_cnt, struct srp_request *req,
                       struct srp_direct_buf *buf)
 {
@@ -577,10 +587,15 @@ static int srp_map_fmr(struct srp_device *dev, struct scatterlist *scat,
        int page_cnt;
        int i, j;
        int ret;
+        struct srp_device *dev = target->srp_host->dev;
        if (!dev->fmr_pool)
                return -ENODEV;
+        if ((sg_dma_address(&scat[0]) & ~dev->fmr_page_mask) &&
+            mellanox_workarounds && !memcmp(&target->ioc_guid, mellanox_oui, 3))
+                return -EINVAL;
        len = page_cnt = 0;
        for (i = 0; i < sg_cnt; ++i) {
                if (sg_dma_address(&scat[i]) & ~dev->fmr_page_mask) {
@@ -683,7 +698,7 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                buf->va  = cpu_to_be64(sg_dma_address(scat));
                buf->key = cpu_to_be32(target->srp_host->dev->mr->rkey);
                buf->len = cpu_to_be32(sg_dma_len(scat));
-        } else if (srp_map_fmr(target->srp_host->dev, scat, count, req,
+        } else if (srp_map_fmr(target, scat, count, req,
                               (void *) cmd->add_data)) {
                /*
                 * FMR mapping failed, and the scatterlist has more
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index f5fe7fb4b3ad..d5d649f5ccdb 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -90,6 +90,15 @@ config ADB_PMU_LED
          and the ide-disk LED trigger and configure appropriately through
          sysfs.
+config ADB_PMU_LED_IDE
+        bool "Use front LED as IDE LED by default"
+        depends on ADB_PMU_LED
+        select LEDS_TRIGGERS
+        select LEDS_TRIGGER_IDE_DISK
+        help
+          This option makes the front LED default to the IDE trigger
+          so that it blinks on IDE activity.
 config PMAC_SMU
        bool "Support for SMU  based PowerMacs"
        depends on PPC_PMAC64
@@ -100,7 +109,7 @@ config PMAC_SMU
 config PMAC_APM_EMU
        tristate "APM emulation"
-        depends on PPC_PMAC && PPC32 && PM
+        depends on PPC_PMAC && PPC32 && PM && ADB_PMU
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
@@ -115,8 +124,6 @@ config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
        depends on ADB_PMU && FB = y && (BROKEN || !PPC64)
        select FB_BACKLIGHT
-        select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
        help
          Say Y here to enable Macintosh specific extensions of the generic
          backlight code. With this enabled, the brightness keys on older
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 545be1ed6927..c69d23bb255e 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -45,14 +45,11 @@
 #include <linux/pmu.h>
 #include <asm/machdep.h>
+#include <asm/backlight.h>
 #ifdef CONFIG_PPC_PMAC
 #include <asm/pmac_feature.h>
 #endif
-#ifdef CONFIG_PMAC_BACKLIGHT
-#include <asm/backlight.h>
-#endif
 MODULE_AUTHOR("Franz Sirl <Franz.Sirl-kernel@lauterbach.com>");
 #define KEYB_KEYREG     0       /* register # for key up/down data */
@@ -237,11 +234,6 @@ static struct adb_ids keyboard_ids;
 static struct adb_ids mouse_ids;
 static struct adb_ids buttons_ids;
-#ifdef CONFIG_PMAC_BACKLIGHT
-/* Exported to via-pmu.c */
-int disable_kernel_backlight = 0;
-#endif /* CONFIG_PMAC_BACKLIGHT */
 /* Kind of keyboard, see Apple technote 1152  */
 #define ADB_KEYBOARD_UNKNOWN    0
 #define ADB_KEYBOARD_ANSI       0x0100
@@ -527,7 +519,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
                case 0xa:       /* brightness decrease */
 #ifdef CONFIG_PMAC_BACKLIGHT
-                        if (!disable_kernel_backlight && down)
+                        if (down)
                                pmac_backlight_key_down();
 #endif
                        input_report_key(adbhid[id]->input, KEY_BRIGHTNESSDOWN, down);
@@ -535,7 +527,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
                case 0x9:       /* brightness increase */
 #ifdef CONFIG_PMAC_BACKLIGHT
-                        if (!disable_kernel_backlight && down)
+                        if (down)
                                pmac_backlight_key_up();
 #endif
                        input_report_key(adbhid[id]->input, KEY_BRIGHTNESSUP, down);
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index c1fe0b368f76..20bf67244e2c 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -95,6 +95,17 @@
 *      - Use min/max macros here or there
 *      - Latest darwin updated U3H min fan speed to 20% PWM
 *
+ *  July. 06, 2006 : 1.3
+ *      - Fix setting of RPM fans on Xserve G5 (they were going too fast)
+ *      - Add missing slots fan control loop for Xserve G5
+ *      - Lower fixed slots fan speed from 50% to 40% on desktop G5s. We
+ *        still can't properly implement the control loop for these, so let's
+ *        reduce the noise a little bit, it appears that 40% still gives us
+ *        a pretty good air flow
+ *      - Add code to "tickle" the FCU regulary so it doesn't think that
+ *        we are gone while in fact, the machine just didn't need any fan
+ *        speed change lately
+ *
 */
 #include <linux/types.h>
@@ -121,7 +132,7 @@
 #include "therm_pm72.h"
-#define VERSION "1.2b2"
+#define VERSION "1.3"
 #undef DEBUG
@@ -146,6 +157,7 @@ static struct basckside_pid_params	backside_params;
 static struct backside_pid_state        backside_state;
 static struct drives_pid_state          drives_state;
 static struct dimm_pid_state            dimms_state;
+static struct slots_pid_state           slots_state;
 static int                              state;
 static int                              cpu_count;
 static int                              cpu_pid_type;
@@ -154,7 +166,8 @@ static struct completion		ctrl_complete;
 static int                              critical_state;
 static int                              rackmac;
 static s32                              dimm_output_clamp;
+static int                              fcu_rpm_shift;
+static int                              fcu_tickle_ticks;
 static DECLARE_MUTEX(driver_lock);
 /*
@@ -495,13 +508,20 @@ static int start_fcu(void)
        rc = fan_write_reg(0x2e, &buf, 1);
        if (rc < 0)
                return -EIO;
+        rc = fan_read_reg(0, &buf, 1);
+        if (rc < 0)
+                return -EIO;
+        fcu_rpm_shift = (buf == 1) ? 2 : 3;
+        printk(KERN_DEBUG "FCU Initialized, RPM fan shift is %d\n",
+               fcu_rpm_shift);
        return 0;
 }
 static int set_rpm_fan(int fan_index, int rpm)
 {
        unsigned char buf[2];
-        int rc, id;
+        int rc, id, min, max;
        if (fcu_fans[fan_index].type != FCU_FAN_RPM)
                return -EINVAL;
@@ -509,12 +529,15 @@ static int set_rpm_fan(int fan_index, int rpm)
        if (id == FCU_FAN_ABSENT_ID)
                return -EINVAL;
-        if (rpm < 300)
+        min = 2400 >> fcu_rpm_shift;
-                rpm = 300;
+        max = 56000 >> fcu_rpm_shift;
-        else if (rpm > 8191)
-                rpm = 8191;
+        if (rpm < min)
-        buf[0] = rpm >> 5;
+                rpm = min;
-        buf[1] = rpm << 3;
+        else if (rpm > max)
+                rpm = max;
+        buf[0] = rpm >> (8 - fcu_rpm_shift);
+        buf[1] = rpm << fcu_rpm_shift;
        rc = fan_write_reg(0x10 + (id * 2), buf, 2);
        if (rc < 0)
                return -EIO;
@@ -551,7 +574,7 @@ static int get_rpm_fan(int fan_index, int programmed)
        if (rc != 2)
                return -EIO;
-        return (buf[0] << 5) | buf[1] >> 3;
+        return (buf[0] << (8 - fcu_rpm_shift)) | buf[1] >> fcu_rpm_shift;
 }
 static int set_pwm_fan(int fan_index, int pwm)
@@ -609,6 +632,26 @@ static int get_pwm_fan(int fan_index)
        return (buf[0] * 1000) / 2559;
 }
+static void tickle_fcu(void)
+{
+        int pwm;
+        pwm = get_pwm_fan(SLOTS_FAN_PWM_INDEX);
+        DBG("FCU Tickle, slots fan is: %d\n", pwm);
+        if (pwm < 0)
+                pwm = 100;
+        if (!rackmac) {
+                pwm = SLOTS_FAN_DEFAULT_PWM;
+        } else if (pwm < SLOTS_PID_OUTPUT_MIN)
+                pwm = SLOTS_PID_OUTPUT_MIN;
+        /* That is hopefully enough to make the FCU happy */
+        set_pwm_fan(SLOTS_FAN_PWM_INDEX, pwm);
+}
 /*
 * Utility routine to read the CPU calibration EEPROM data
 * from the device-tree
@@ -715,6 +758,9 @@ BUILD_SHOW_FUNC_INT(backside_fan_pwm, backside_state.pwm)
 BUILD_SHOW_FUNC_FIX(drives_temperature, drives_state.last_temp)
 BUILD_SHOW_FUNC_INT(drives_fan_rpm, drives_state.rpm)
+BUILD_SHOW_FUNC_FIX(slots_temperature, slots_state.last_temp)
+BUILD_SHOW_FUNC_INT(slots_fan_pwm, slots_state.pwm)
 BUILD_SHOW_FUNC_FIX(dimms_temperature, dimms_state.last_temp)
 static DEVICE_ATTR(cpu0_temperature,S_IRUGO,show_cpu0_temperature,NULL);
@@ -735,6 +781,9 @@ static DEVICE_ATTR(backside_fan_pwm,S_IRUGO,show_backside_fan_pwm,NULL);
 static DEVICE_ATTR(drives_temperature,S_IRUGO,show_drives_temperature,NULL);
 static DEVICE_ATTR(drives_fan_rpm,S_IRUGO,show_drives_fan_rpm,NULL);
+static DEVICE_ATTR(slots_temperature,S_IRUGO,show_slots_temperature,NULL);
+static DEVICE_ATTR(slots_fan_pwm,S_IRUGO,show_slots_fan_pwm,NULL);
 static DEVICE_ATTR(dimms_temperature,S_IRUGO,show_dimms_temperature,NULL);
 /*
@@ -1076,6 +1125,9 @@ static void do_monitor_cpu_rack(struct cpu_pid_state *state)
        fan_min = dimm_output_clamp;
        fan_min = max(fan_min, (int)state->mpu.rminn_intake_fan);
+        DBG(" CPU min mpu = %d, min dimm = %d\n",
+            state->mpu.rminn_intake_fan, dimm_output_clamp);
        state->rpm = max(state->rpm, (int)fan_min);
        state->rpm = min(state->rpm, (int)state->mpu.rmaxn_intake_fan);
        state->intake_rpm = state->rpm;
@@ -1374,7 +1426,8 @@ static void do_monitor_drives(struct drives_pid_state *state)
        DBG("  current rpm: %d\n", state->rpm);
        /* Get some sensor readings */
-        temp = le16_to_cpu(i2c_smbus_read_word_data(state->monitor, DS1775_TEMP)) << 8;
+        temp = le16_to_cpu(i2c_smbus_read_word_data(state->monitor,
+                                                    DS1775_TEMP)) << 8;
        state->last_temp = temp;
        DBG("  temp: %d.%03d, target: %d.%03d\n", FIX32TOPRINT(temp),
            FIX32TOPRINT(DRIVES_PID_INPUT_TARGET));
@@ -1575,7 +1628,7 @@ static int init_dimms_state(struct dimm_pid_state *state)
 }
 /*
- * Dispose of the state data for the drives control loop
+ * Dispose of the state data for the DIMM control loop
 */
 static void dispose_dimms_state(struct dimm_pid_state *state)
 {
@@ -1588,6 +1641,127 @@ static void dispose_dimms_state(struct dimm_pid_state *state)
        state->monitor = NULL;
 }
+/*
+ * Slots fan control loop
+ */
+static void do_monitor_slots(struct slots_pid_state *state)
+{
+        s32 temp, integral, derivative;
+        s64 integ_p, deriv_p, prop_p, sum;
+        int i, rc;
+        if (--state->ticks != 0)
+                return;
+        state->ticks = SLOTS_PID_INTERVAL;
+        DBG("slots:\n");
+        /* Check fan status */
+        rc = get_pwm_fan(SLOTS_FAN_PWM_INDEX);
+        if (rc < 0) {
+                printk(KERN_WARNING "Error %d reading slots fan !\n", rc);
+                /* XXX What do we do now ? */
+        } else
+                state->pwm = rc;
+        DBG("  current pwm: %d\n", state->pwm);
+        /* Get some sensor readings */
+        temp = le16_to_cpu(i2c_smbus_read_word_data(state->monitor,
+                                                    DS1775_TEMP)) << 8;
+        state->last_temp = temp;
+        DBG("  temp: %d.%03d, target: %d.%03d\n", FIX32TOPRINT(temp),
+            FIX32TOPRINT(SLOTS_PID_INPUT_TARGET));
+        /* Store temperature and error in history array */
+        state->cur_sample = (state->cur_sample + 1) % SLOTS_PID_HISTORY_SIZE;
+        state->sample_history[state->cur_sample] = temp;
+        state->error_history[state->cur_sample] = temp - SLOTS_PID_INPUT_TARGET;
+        /* If first loop, fill the history table */
+        if (state->first) {
+                for (i = 0; i < (SLOTS_PID_HISTORY_SIZE - 1); i++) {
+                        state->cur_sample = (state->cur_sample + 1) %
+                                SLOTS_PID_HISTORY_SIZE;
+                        state->sample_history[state->cur_sample] = temp;
+                        state->error_history[state->cur_sample] =
+                                temp - SLOTS_PID_INPUT_TARGET;
+                }
+                state->first = 0;
+        }
+        /* Calculate the integral term */
+        sum = 0;
+        integral = 0;
+        for (i = 0; i < SLOTS_PID_HISTORY_SIZE; i++)
+                integral += state->error_history[i];
+        integral *= SLOTS_PID_INTERVAL;
+        DBG("  integral: %08x\n", integral);
+        integ_p = ((s64)SLOTS_PID_G_r) * (s64)integral;
+        DBG("   integ_p: %d\n", (int)(integ_p >> 36));
+        sum += integ_p;
+        /* Calculate the derivative term */
+        derivative = state->error_history[state->cur_sample] -
+                state->error_history[(state->cur_sample + SLOTS_PID_HISTORY_SIZE - 1)
+                                    % SLOTS_PID_HISTORY_SIZE];
+        derivative /= SLOTS_PID_INTERVAL;
+        deriv_p = ((s64)SLOTS_PID_G_d) * (s64)derivative;
+        DBG("   deriv_p: %d\n", (int)(deriv_p >> 36));
+        sum += deriv_p;
+        /* Calculate the proportional term */
+        prop_p = ((s64)SLOTS_PID_G_p) * (s64)(state->error_history[state->cur_sample]);
+        DBG("   prop_p: %d\n", (int)(prop_p >> 36));
+        sum += prop_p;
+        /* Scale sum */
+        sum >>= 36;
+        DBG("   sum: %d\n", (int)sum);
+        state->pwm = (s32)sum;
+        state->pwm = max(state->pwm, SLOTS_PID_OUTPUT_MIN);
+        state->pwm = min(state->pwm, SLOTS_PID_OUTPUT_MAX);
+        DBG("** DRIVES PWM: %d\n", (int)state->pwm);
+        set_pwm_fan(SLOTS_FAN_PWM_INDEX, state->pwm);
+}
+/*
+ * Initialize the state structure for the slots bay fan control loop
+ */
+static int init_slots_state(struct slots_pid_state *state)
+{
+        state->ticks = 1;
+        state->first = 1;
+        state->pwm = 50;
+        state->monitor = attach_i2c_chip(XSERVE_SLOTS_LM75, "slots_temp");
+        if (state->monitor == NULL)
+                return -ENODEV;
+        device_create_file(&of_dev->dev, &dev_attr_slots_temperature);
+        device_create_file(&of_dev->dev, &dev_attr_slots_fan_pwm);
+        return 0;
+}
+/*
+ * Dispose of the state data for the slots control loop
+ */
+static void dispose_slots_state(struct slots_pid_state *state)
+{
+        if (state->monitor == NULL)
+                return;
+        device_remove_file(&of_dev->dev, &dev_attr_slots_temperature);
+        device_remove_file(&of_dev->dev, &dev_attr_slots_fan_pwm);
+        detach_i2c_chip(state->monitor);
+        state->monitor = NULL;
+}
 static int call_critical_overtemp(void)
 {
        char *argv[] = { critical_overtemp_path, NULL };
@@ -1617,14 +1791,17 @@ static int main_control_loop(void *x)
                goto out;
        }
-        /* Set the PCI fan once for now */
+        /* Set the PCI fan once for now on non-RackMac */
-        set_pwm_fan(SLOTS_FAN_PWM_INDEX, SLOTS_FAN_DEFAULT_PWM);
+        if (!rackmac)
+                set_pwm_fan(SLOTS_FAN_PWM_INDEX, SLOTS_FAN_DEFAULT_PWM);
        /* Initialize ADCs */
        initialize_adc(&cpu_state[0]);
        if (cpu_state[1].monitor != NULL)
                initialize_adc(&cpu_state[1]);
+        fcu_tickle_ticks = FCU_TICKLE_TICKS;
        up(&driver_lock);
        while (state == state_attached) {
@@ -1634,6 +1811,12 @@ static int main_control_loop(void *x)
                down(&driver_lock);
+                /* Tickle the FCU just in case */
+                if (--fcu_tickle_ticks < 0) {
+                        fcu_tickle_ticks = FCU_TICKLE_TICKS;
+                        tickle_fcu();
+                }
                /* First, we always calculate the new DIMMs state on an Xserve */
                if (rackmac)
                        do_monitor_dimms(&dimms_state);
@@ -1654,7 +1837,9 @@ static int main_control_loop(void *x)
                }
                /* Then, the rest */
                do_monitor_backside(&backside_state);
-                if (!rackmac)
+                if (rackmac)
+                        do_monitor_slots(&slots_state);
+                else
                        do_monitor_drives(&drives_state);
                up(&driver_lock);
@@ -1696,6 +1881,7 @@ static void dispose_control_loops(void)
        dispose_cpu_state(&cpu_state[1]);
        dispose_backside_state(&backside_state);
        dispose_drives_state(&drives_state);
+        dispose_slots_state(&slots_state);
        dispose_dimms_state(&dimms_state);
 }
@@ -1745,6 +1931,8 @@ static int create_control_loops(void)
                goto fail;
        if (rackmac && init_dimms_state(&dimms_state))
                goto fail;
+        if (rackmac && init_slots_state(&slots_state))
+                goto fail;
        if (!rackmac && init_drives_state(&drives_state))
                goto fail;
diff --git a/drivers/macintosh/therm_pm72.h b/drivers/macintosh/therm_pm72.h
index fc7e9b7ecaf2..393cc9df94e1 100644
--- a/drivers/macintosh/therm_pm72.h
+++ b/drivers/macintosh/therm_pm72.h
@@ -105,6 +105,7 @@ static char * critical_overtemp_path = "/sbin/critical_overtemp";
 #define DRIVES_DALLAS_ID        0x94
 #define BACKSIDE_MAX_ID         0x98
 #define XSERVE_DIMMS_LM87       0x25a
+#define XSERVE_SLOTS_LM75       0x290
 /*
 * Some MAX6690, DS1775, LM87 register definitions
@@ -198,7 +199,7 @@ struct drives_pid_state
 #define SLOTS_FAN_PWM_DEFAULT_ID        2
 #define SLOTS_FAN_PWM_INDEX             2
-#define SLOTS_FAN_DEFAULT_PWM           50 /* Do better here ! */
+#define SLOTS_FAN_DEFAULT_PWM           40 /* Do better here ! */
 /*
@@ -206,7 +207,7 @@ struct drives_pid_state
 */
 #define DIMM_PID_G_d                    0
 #define DIMM_PID_G_p                    0
-#define DIMM_PID_G_r                    0x6553600
+#define DIMM_PID_G_r                    0x06553600
 #define DIMM_PID_INPUT_TARGET           3276800
 #define DIMM_PID_INTERVAL               1
 #define DIMM_PID_OUTPUT_MAX             14000
@@ -226,6 +227,31 @@ struct dimm_pid_state
 };
+/*
+ * PID factors for the Xserve Slots control loop
+ */
+#define SLOTS_PID_G_d                   0
+#define SLOTS_PID_G_p                   0
+#define SLOTS_PID_G_r                   0x00100000
+#define SLOTS_PID_INPUT_TARGET          3200000
+#define SLOTS_PID_INTERVAL              1
+#define SLOTS_PID_OUTPUT_MAX            100
+#define SLOTS_PID_OUTPUT_MIN            20
+#define SLOTS_PID_HISTORY_SIZE          20
+struct slots_pid_state
+{
+        int                     ticks;
+        struct i2c_client *     monitor;
+        s32                     sample_history[SLOTS_PID_HISTORY_SIZE];
+        s32                     error_history[SLOTS_PID_HISTORY_SIZE];
+        int                     cur_sample;
+        s32                     last_temp;
+        int                     first;
+        int                     pwm;
+};
 /* Desktops */
@@ -283,6 +309,9 @@ struct cpu_pid_state
        s32                     pump_max;
 };
+/* Tickle FCU every 10 seconds */
+#define FCU_TICKLE_TICKS        10
 /*
 * Driver state
 */
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
index b42d05f2aaff..d3f8d75bcbb4 100644
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
@@ -15,8 +15,9 @@
 #define MAX_PMU_LEVEL 0xFF
-static struct device_node *vias;
 static struct backlight_properties pmu_backlight_data;
+static spinlock_t pmu_backlight_lock;
+static int sleeping;
 static int pmu_backlight_get_level_brightness(struct fb_info *info,
                int level)
@@ -40,23 +41,36 @@ static int pmu_backlight_update_status(struct backlight_device *bd)
 {
        struct fb_info *info = class_get_devdata(&bd->class_dev);
        struct adb_request req;
-        int pmulevel, level = bd->props->brightness;
+        unsigned long flags;
+        int level = bd->props->brightness;
-        if (vias == NULL)
+        spin_lock_irqsave(&pmu_backlight_lock, flags);
-                return -ENODEV;
+        /* Don't update brightness when sleeping */
+        if (sleeping)
+                goto out;
        if (bd->props->power != FB_BLANK_UNBLANK ||
            bd->props->fb_blank != FB_BLANK_UNBLANK)
                level = 0;
-        pmulevel = pmu_backlight_get_level_brightness(info, level);
+        if (level > 0) {
+                int pmulevel = pmu_backlight_get_level_brightness(info, level);
-        pmu_request(&req, NULL, 2, PMU_BACKLIGHT_BRIGHT, pmulevel);
+                pmu_request(&req, NULL, 2, PMU_BACKLIGHT_BRIGHT, pmulevel);
-        pmu_wait_complete(&req);
+                pmu_wait_complete(&req);
-        pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
+                pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
-                PMU_POW_BACKLIGHT | (level > 0 ? PMU_POW_ON : PMU_POW_OFF));
+                        PMU_POW_BACKLIGHT | PMU_POW_ON);
-        pmu_wait_complete(&req);
+                pmu_wait_complete(&req);
+        } else {
+                pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
+                        PMU_POW_BACKLIGHT | PMU_POW_OFF);
+                pmu_wait_complete(&req);
+        }
+out:
+        spin_unlock_irqrestore(&pmu_backlight_lock, flags);
        return 0;
 }
@@ -73,15 +87,39 @@ static struct backlight_properties pmu_backlight_data = {
        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
-void __init pmu_backlight_init(struct device_node *in_vias)
+#ifdef CONFIG_PM
+static int pmu_backlight_sleep_call(struct pmu_sleep_notifier *self, int when)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&pmu_backlight_lock, flags);
+        switch (when) {
+        case PBOOK_SLEEP_REQUEST:
+                sleeping = 1;
+                break;
+        case PBOOK_WAKE:
+                sleeping = 0;
+                break;
+        }
+        spin_unlock_irqrestore(&pmu_backlight_lock, flags);
+        return PBOOK_SLEEP_OK;
+}
+static struct pmu_sleep_notifier pmu_backlight_sleep_notif = {
+        .notifier_call = pmu_backlight_sleep_call,
+};
+#endif
+void __init pmu_backlight_init()
 {
        struct backlight_device *bd;
        struct fb_info *info;
        char name[10];
        int level, autosave;
-        vias = in_vias;
        /* Special case for the old PowerBook since I can't test on it */
        autosave =
                machine_is_compatible("AAPL,3400/2400") ||
@@ -141,6 +179,10 @@ void __init pmu_backlight_init(struct device_node *in_vias)
                pmac_backlight = bd;
        mutex_unlock(&pmac_backlight_mutex);
+#ifdef CONFIG_PM
+        pmu_register_sleep_notifier(&pmu_backlight_sleep_notif);
+#endif
        printk("pmubl: Backlight initialized (%s)\n", name);
        return;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index af8375ed0f5e..5189d5454b1f 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -74,7 +74,7 @@ static void pmu_led_set(struct led_classdev *led_cdev,
 static struct led_classdev pmu_led = {
        .name = "pmu-front-led",
-#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK
+#ifdef CONFIG_ADB_PMU_LED_IDE
        .default_trigger = "ide-disk",
 #endif
        .brightness_set = pmu_led_set,
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 06ca80bfd6b9..ea386801e215 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -16,7 +16,6 @@
 *    a sleep or a freq. switch
 *  - Move sleep code out of here to pmac_pm, merge into new
 *    common PM infrastructure
- *  - Move backlight code out as well
 *  - Save/Restore PCI space properly
 *
 */
@@ -60,9 +59,7 @@
 #include <asm/mmu_context.h>
 #include <asm/cputable.h>
 #include <asm/time.h>
-#ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
-#endif
 #include "via-pmu-event.h"
@@ -177,10 +174,6 @@ static int query_batt_timer = BATTERY_POLLING_COUNT;
 static struct adb_request batt_req;
 static struct proc_dir_entry *proc_pmu_batt[PMU_MAX_BATTERIES];
-#if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
-extern int disable_kernel_backlight;
-#endif /* defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT) */
 int __fake_sleep;
 int asleep;
 BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
@@ -466,7 +459,7 @@ static int __init via_pmu_dev_init(void)
 #ifdef CONFIG_PMAC_BACKLIGHT
        /* Initialize backlight */
-        pmu_backlight_init(vias);
+        pmu_backlight_init();
 #endif
 #ifdef CONFIG_PPC32
@@ -1403,11 +1396,8 @@ next:
        else if ((1 << pirq) & PMU_INT_SNDBRT) {
 #ifdef CONFIG_PMAC_BACKLIGHT
                if (len == 3)
-#ifdef CONFIG_INPUT_ADBHID
+                        pmac_backlight_set_legacy_brightness_pmu(data[1] >> 4);
-                        if (!disable_kernel_backlight)
+#endif
-#endif /* CONFIG_INPUT_ADBHID */
-                                pmac_backlight_set_legacy_brightness(data[1] >> 4);
-#endif /* CONFIG_PMAC_BACKLIGHT */
        }
        /* Tick interrupt */
        else if ((1 << pirq) & PMU_INT_TICK) {
@@ -2414,7 +2404,7 @@ struct pmu_private {
        spinlock_t lock;
 #if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
        int     backlight_locker;
-#endif /* defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT) */     
+#endif
 };
 static LIST_HEAD(all_pmu_pvt);
@@ -2464,7 +2454,7 @@ pmu_open(struct inode *inode, struct file *file)
        spin_lock_irqsave(&all_pvt_lock, flags);
 #if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
        pp->backlight_locker = 0;
-#endif /* defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT) */     
+#endif
        list_add(&pp->list, &all_pmu_pvt);
        spin_unlock_irqrestore(&all_pvt_lock, flags);
        file->private_data = pp;
@@ -2559,13 +2549,12 @@ pmu_release(struct inode *inode, struct file *file)
                spin_lock_irqsave(&all_pvt_lock, flags);
                list_del(&pp->list);
                spin_unlock_irqrestore(&all_pvt_lock, flags);
 #if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
-                if (pp->backlight_locker) {
+                if (pp->backlight_locker)
-                        spin_lock_irqsave(&pmu_lock, flags);
+                        pmac_backlight_enable();
-                        disable_kernel_backlight--;
+#endif
-                        spin_unlock_irqrestore(&pmu_lock, flags);
-                }
-#endif /* defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT) */
                kfree(pp);
        }
        unlock_kernel();
@@ -2642,18 +2631,18 @@ pmu_ioctl(struct inode * inode, struct file *filp,
 #ifdef CONFIG_INPUT_ADBHID
        case PMU_IOC_GRAB_BACKLIGHT: {
                struct pmu_private *pp = filp->private_data;
-                unsigned long flags;
                if (pp->backlight_locker)
                        return 0;
                pp->backlight_locker = 1;
-                spin_lock_irqsave(&pmu_lock, flags);
+                pmac_backlight_disable();
-                disable_kernel_backlight++;
-                spin_unlock_irqrestore(&pmu_lock, flags);
                return 0;
        }
 #endif /* CONFIG_INPUT_ADBHID */
 #endif /* CONFIG_PMAC_BACKLIGHT_LEGACY */
        case PMU_IOC_GET_MODEL:
                return put_user(pmu_kind, argp);
        case PMU_IOC_HAS_ADB:
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 59ac35ddd51e..57b34cda99f5 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -526,7 +526,9 @@ static int dvb_frontend_thread(void *data)
        fepriv->delay = 3*HZ;
        fepriv->status = 0;
        fepriv->wakeup = 0;
-        fepriv->reinitialise = 1;
+        fepriv->reinitialise = 0;
+        dvb_frontend_init(fe);
        while (1) {
                up(&fepriv->sem);           /* is locked when we enter the thread... */
@@ -1013,17 +1015,18 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
                return ret;
        if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
+                /* normal tune mode when opened R/W */
+                fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT;
+                fepriv->tone = -1;
+                fepriv->voltage = -1;
                ret = dvb_frontend_start (fe);
                if (ret)
                        dvb_generic_release (inode, file);
                /*  empty event queue */
                fepriv->events.eventr = fepriv->events.eventw = 0;
-                /* normal tune mode when opened R/W */
-                fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT;
-                fepriv->tone = -1;
-                fepriv->voltage = -1;
        }
        return ret;
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index a189683454b7..2be33f27c69f 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -194,11 +194,11 @@ struct dvb_pll_desc dvb_pll_tda665x = {
                {  253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0  10 */ },
                {  383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0  10 */ },
                {  443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
-                {  444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  444000000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1  00 */ },
-                {  583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0  11 */ },
+                {  583834000, 36249333, 166667, 0xca, 0x64 /* 011 0 0 1  00 */ },
-                {  793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0  11 */ },
+                {  793834000, 36249333, 166667, 0xca, 0xa4 /* 101 0 0 1  00 */ },
-                {  444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  444834000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1  00 */ },
-                {  861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0  11 */ },
+                {  861000000, 36249333, 166667, 0xca, 0xe4 /* 111 0 0 1  00 */ },
        }
 };
 EXPORT_SYMBOL(dvb_pll_tda665x);
@@ -613,7 +613,21 @@ static struct dvb_tuner_ops dvb_pll_tuner_ops = {
 int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc)
 {
+        u8 b1 [] = { 0 };
+        struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 };
        struct dvb_pll_priv *priv = NULL;
+        int ret;
+        if (i2c != NULL) {
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+                ret = i2c_transfer (i2c, &msg, 1);
+                if (ret != 1)
+                        return -1;
+                if (fe->ops.i2c_gate_ctrl)
+                             fe->ops.i2c_gate_ctrl(fe, 0);
+        }
        priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL);
        if (priv == NULL)
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 500f15c10aaf..4506165c5de2 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2203,8 +2203,8 @@ static int frontend_init(struct av7110 *av7110)
                                av7110->fe->ops.tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
                                /* set TDA9819 into DVB mode */
-                                saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
+                                saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
-                                saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                                saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
                                /* tuner on this needs a slower i2c bus speed */
                                av7110->dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 64055461559d..6ffe53fdcf57 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -272,8 +272,8 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
                                if (ves1820_writereg(dev, 0x09, 0x0f, 0x60))
                                        dprintk(1, "setting band in demodulator failed.\n");
                        } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                                saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // TDA9198 pin9(STD)
+                                saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // TDA9819 pin9(STD)
-                                saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); // TDA9198 pin30(VIF)
+                                saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); // TDA9819 pin30(VIF)
                        }
                        if (i2c_writereg(av7110, 0x48, 0x02, 0xd0) != 1)
                                dprintk(1, "saa7113 write failed @ card %d", av7110->dvb_adapter.num);
@@ -308,8 +308,8 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
                        if (ves1820_writereg(dev, 0x09, 0x0f, 0x20))
                                dprintk(1, "setting band in demodulator failed.\n");
                } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
+                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
-                        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
                }
        }
@@ -750,8 +750,8 @@ int av7110_init_analog_module(struct av7110 *av7110)
                        if (ves1820_writereg(av7110->dev, 0x09, 0x0f, 0x20))
                                dprintk(1, "setting band in demodulator failed.\n");
                } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                        saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
+                        saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
-                        saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                        saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
                }
                /* init the saa7113 */
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 5f111d407730..2d21fec23b4d 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1303,6 +1303,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
        budget_av->budget.dvb_adapter.priv = budget_av;
        frontend_init(budget_av);
        ciintf_init(budget_av);
+        ttpci_budget_init_hooks(&budget_av->budget);
        return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 4b966eea3834..ffbbb3e34be4 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1101,6 +1101,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
        budget_ci->budget.dvb_adapter.priv = budget_ci;
        frontend_init(budget_ci);
+        ttpci_budget_init_hooks(&budget_ci->budget);
        return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index e4cf7775e07f..e15562f81664 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -63,9 +63,6 @@ static int stop_ts_capture(struct budget *budget)
 {
        dprintk(2, "budget: %p\n", budget);
-        if (--budget->feeding)
-                return budget->feeding;
        saa7146_write(budget->dev, MC1, MASK_20);       // DMA3 off
        SAA7146_IER_DISABLE(budget->dev, MASK_10);
        return 0;
@@ -77,8 +74,8 @@ static int start_ts_capture(struct budget *budget)
        dprintk(2, "budget: %p\n", budget);
-        if (budget->feeding)
+        if (!budget->feeding || !budget->fe_synced)
-                return ++budget->feeding;
+                return 0;
        saa7146_write(dev, MC1, MASK_20);       // DMA3 off
@@ -139,7 +136,33 @@ static int start_ts_capture(struct budget *budget)
        SAA7146_IER_ENABLE(budget->dev, MASK_10);       /* VPE */
        saa7146_write(dev, MC1, (MASK_04 | MASK_20));   /* DMA3 on */
-        return ++budget->feeding;
+        return 0;
+}
+static int budget_read_fe_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct budget *budget = (struct budget *) fe->dvb->priv;
+        int synced;
+        int ret;
+        if (budget->read_fe_status)
+                ret = budget->read_fe_status(fe, status);
+        else
+                ret = -EINVAL;
+        if (!ret) {
+                synced = (*status & FE_HAS_LOCK);
+                if (synced != budget->fe_synced) {
+                        budget->fe_synced = synced;
+                        spin_lock(&budget->feedlock);
+                        if (synced)
+                                start_ts_capture(budget);
+                        else
+                                stop_ts_capture(budget);
+                        spin_unlock(&budget->feedlock);
+                }
+        }
+        return ret;
 }
 static void vpeirq(unsigned long data)
@@ -267,7 +290,7 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
 {
        struct dvb_demux *demux = feed->demux;
        struct budget *budget = (struct budget *) demux->priv;
-        int status;
+        int status = 0;
        dprintk(2, "budget: %p\n", budget);
@@ -276,7 +299,8 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
        spin_lock(&budget->feedlock);
        feed->pusi_seen = 0; /* have a clean section start */
-        status = start_ts_capture(budget);
+        if (budget->feeding++ == 0)
+                status = start_ts_capture(budget);
        spin_unlock(&budget->feedlock);
        return status;
 }
@@ -285,12 +309,13 @@ static int budget_stop_feed(struct dvb_demux_feed *feed)
 {
        struct dvb_demux *demux = feed->demux;
        struct budget *budget = (struct budget *) demux->priv;
-        int status;
+        int status = 0;
        dprintk(2, "budget: %p\n", budget);
        spin_lock(&budget->feedlock);
-        status = stop_ts_capture(budget);
+        if (--budget->feeding == 0)
+                status = stop_ts_capture(budget);
        spin_unlock(&budget->feedlock);
        return status;
 }
@@ -470,6 +495,14 @@ err:
        return ret;
 }
+void ttpci_budget_init_hooks(struct budget *budget)
+{
+        if (budget->dvb_frontend && !budget->read_fe_status) {
+                budget->read_fe_status = budget->dvb_frontend->ops.read_status;
+                budget->dvb_frontend->ops.read_status = budget_read_fe_status;
+        }
+}
 int ttpci_budget_deinit(struct budget *budget)
 {
        struct saa7146_dev *dev = budget->dev;
@@ -508,11 +541,8 @@ void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port)
        spin_lock(&budget->feedlock);
        budget->video_port = video_port;
        if (budget->feeding) {
-                int oldfeeding = budget->feeding;
-                budget->feeding = 1;
                stop_ts_capture(budget);
                start_ts_capture(budget);
-                budget->feeding = oldfeeding;
        }
        spin_unlock(&budget->feedlock);
 }
@@ -520,6 +550,7 @@ void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port)
 EXPORT_SYMBOL_GPL(ttpci_budget_debiread);
 EXPORT_SYMBOL_GPL(ttpci_budget_debiwrite);
 EXPORT_SYMBOL_GPL(ttpci_budget_init);
+EXPORT_SYMBOL_GPL(ttpci_budget_init_hooks);
 EXPORT_SYMBOL_GPL(ttpci_budget_deinit);
 EXPORT_SYMBOL_GPL(ttpci_budget_irq10_handler);
 EXPORT_SYMBOL_GPL(ttpci_budget_set_video_port);
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index ee60ce90a400..57227441891e 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -617,6 +617,8 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
+        ttpci_budget_init_hooks(budget);
        return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 35761f13c12b..863dffb4ed8e 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -375,9 +375,6 @@ static void frontend_init(struct budget *budget)
                if (budget->dvb_frontend) {
                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                        budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
-                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                        break;
                }
                break;
@@ -474,6 +471,8 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
+        ttpci_budget_init_hooks(budget);
        return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index ecea3a13030e..e8a5c79178e1 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -52,9 +52,6 @@ struct budget {
        struct dmx_frontend hw_frontend;
        struct dmx_frontend mem_frontend;
-        int fe_synced;
-        struct mutex pid_mutex;
        int ci_present;
        int video_port;
@@ -74,6 +71,9 @@ struct budget {
        struct dvb_adapter dvb_adapter;
        struct dvb_frontend *dvb_frontend;
+        int (*read_fe_status)(struct dvb_frontend *fe, fe_status_t *status);
+        int fe_synced;
        void *priv;
 };
@@ -106,6 +106,7 @@ static struct saa7146_pci_extension_data x_var = { \
 extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
                             struct saa7146_pci_extension_data *info,
                             struct module *owner);
+extern void ttpci_budget_init_hooks(struct budget *budget);
 extern int ttpci_budget_deinit(struct budget *budget);
 extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
 extern void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6d532f170ce5..fe56862d51e4 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -145,7 +145,7 @@ config VIDEO_SAA5246A
 config VIDEO_SAA5249
        tristate "SAA5249 Teletext processor"
-        depends on VIDEO_DEV && I2C
+        depends on VIDEO_DEV && I2C && VIDEO_V4L1
        help
          Support for I2C bus based teletext using the SAA5249 chip. At the
          moment this is only useful on some European WinTV cards.
@@ -155,7 +155,7 @@ config VIDEO_SAA5249
 config TUNER_3036
        tristate "SAB3036 tuner"
-        depends on VIDEO_DEV && I2C
+        depends on VIDEO_DEV && I2C && VIDEO_V4L1
        help
          Say Y here to include support for Philips SAB3036 compatible tuners.
          If in doubt, say N.
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 153f6a4a96c9..cdcf55650714 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_BT848
        tristate "BT848 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
+        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_BTCX
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5764a89d3562..20dff7c316eb 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3923,7 +3923,12 @@ 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);
-        video_device_create_file(btv->video_dev, &class_device_attr_card);
+        if (class_device_create_file(&btv->video_dev->class_dev,
+                                     &class_device_attr_card)<0) {
+                printk(KERN_ERR "bttv%d: class_device_create_file 'card' "
+                       "failed\n", btv->c.nr);
+                goto err;
+        }
        /* vbi */
        btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi");
@@ -4287,6 +4292,8 @@ static struct pci_driver bttv_pci_driver = {
 static int bttv_init_module(void)
 {
+        int ret;
        bttv_num = 0;
        printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
@@ -4308,7 +4315,11 @@ static int bttv_init_module(void)
        bttv_check_chipset();
-        bus_register(&bttv_sub_bus_type);
+        ret = bus_register(&bttv_sub_bus_type);
+        if (ret < 0) {
+                printk(KERN_WARNING "bttv: bus_register error: %d\n", ret);
+                return ret;
+        }
        return pci_register_driver(&bttv_pci_driver);
 }
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 8c9f0f7cf467..63676e7bd635 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -31,11 +31,16 @@
 #include <asm/io.h>
 #include "bttvp.h"
-/* Offset from line sync pulse leading edge (0H) in 1 / sampling_rate:
+/* Offset from line sync pulse leading edge (0H) to start of VBI capture,
-   bt8x8 /HRESET pulse starts at 0H and has length 64 / fCLKx1 (E|O_VTC
+   in fCLKx2 pixels.  According to the datasheet, VBI capture starts
-   HSFMT = 0). VBI_HDELAY (always 0) is an offset from the trailing edge
+   VBI_HDELAY fCLKx1 pixels from the tailing edgeof /HRESET, and /HRESET
-   of /HRESET in 1 / fCLKx1, and the sampling_rate tvnorm->Fsc is fCLKx2. */
+   is 64 fCLKx1 pixels wide.  VBI_HDELAY is set to 0, so this should be
-#define VBI_OFFSET ((64 + 0) * 2)
+   (64 + 0) * 2 = 128 fCLKx2 pixels.  But it's not!  The datasheet is
+   Just Plain Wrong.  The real value appears to be different for
+   different revisions of the bt8x8 chips, and to be affected by the
+   horizontal scaling factor.  Experimentally, the value is measured
+   to be about 244.  */
+#define VBI_OFFSET 244
 #define VBI_DEFLINES 16
 #define VBI_MAXLINES 32
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index 353d02b67c33..9dddff42ec13 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -490,6 +490,23 @@ static inline int put_v4l2_input(struct v4l2_input *kp, struct v4l2_input __user
        return 0;
 }
+struct video_code32
+{
+        char            loadwhat[16];   /* name or tag of file being passed */
+        compat_int_t    datasize;
+        unsigned char   *data;
+};
+static inline int microcode32(struct video_code *kp, struct video_code32 __user *up)
+{
+        if(!access_ok(VERIFY_READ, up, sizeof(struct video_code32)) ||
+                copy_from_user(kp->loadwhat, up->loadwhat, sizeof (up->loadwhat)) ||
+                get_user(kp->datasize, &up->datasize) ||
+                copy_from_user(kp->data, up->data, up->datasize))
+                        return -EFAULT;
+        return 0;
+}
 #define VIDIOCGTUNER32          _IOWR('v',4, struct video_tuner32)
 #define VIDIOCSTUNER32          _IOW('v',5, struct video_tuner32)
 #define VIDIOCGWIN32            _IOR('v',9, struct video_window32)
@@ -498,6 +515,7 @@ static inline int put_v4l2_input(struct v4l2_input *kp, struct v4l2_input __user
 #define VIDIOCSFBUF32           _IOW('v',12, struct video_buffer32)
 #define VIDIOCGFREQ32           _IOR('v',14, u32)
 #define VIDIOCSFREQ32           _IOW('v',15, u32)
+#define VIDIOCSMICROCODE32      _IOW('v',27, struct video_code32)
 /* VIDIOC_ENUMINPUT32 is VIDIOC_ENUMINPUT minus 4 bytes of padding alignement */
 #define VIDIOC_ENUMINPUT32      VIDIOC_ENUMINPUT - _IOC(0, 0, 0, 4)
@@ -590,6 +608,7 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg
                struct video_tuner vt;
                struct video_buffer vb;
                struct video_window vw;
+                struct video_code vc;
                struct v4l2_format v2f;
                struct v4l2_buffer v2b;
                struct v4l2_framebuffer v2fb;
@@ -628,6 +647,7 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg
        case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;
        case VIDIOC_S_INPUT32: cmd = VIDIOC_S_INPUT; break;
        case VIDIOC_TRY_FMT32: cmd = VIDIOC_TRY_FMT; break;
+        case VIDIOCSMICROCODE32: cmd = VIDIOCSMICROCODE; break;
        };
        switch(cmd) {
@@ -703,6 +723,10 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg
        case VIDIOC_G_FBUF:
        case VIDIOC_G_INPUT:
                compatible_arg = 0;
+        case VIDIOCSMICROCODE:
+                err = microcode32(&karg.vc, up);
+                compatible_arg = 0;
+                break;
        };
        if(err)
diff --git a/drivers/media/video/cpia2/Kconfig b/drivers/media/video/cpia2/Kconfig
index 513cc0927389..e39a96152004 100644
--- a/drivers/media/video/cpia2/Kconfig
+++ b/drivers/media/video/cpia2/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_CPIA2
        tristate "CPiA2 Video For Linux"
-        depends on VIDEO_DEV && USB
+        depends on VIDEO_DEV && USB && VIDEO_V4L1
        ---help---
          This is the video4linux driver for cameras based on Vision's CPiA2
          (Colour Processor Interface ASIC), such as the Digital Blue QX5
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 72b630a91f41..c25564648993 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -89,7 +89,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
                auxgpio = cx_read(MO_GP1_IO);
                /* Take out the parity part */
-                gpio+=(gpio & 0x7fd) + (auxgpio & 0xef);
+                gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
        } else
                auxgpio = gpio;
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 2225d4b94140..547cdbdb644d 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1180,7 +1180,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                        V4L2_CAP_READWRITE     |
                        V4L2_CAP_STREAMING     |
                        V4L2_CAP_VBI_CAPTURE   |
-                        V4L2_CAP_VIDEO_OVERLAY |
                        0;
                if (UNSET != core->tuner_type)
                        cap->capabilities |= V4L2_CAP_TUNER;
@@ -1226,7 +1225,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                struct v4l2_format *f = arg;
                return cx8800_try_fmt(dev,fh,f);
        }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        /* --- streaming capture ------------------------------------- */
        case VIDIOCGMBUF:
        {
@@ -1585,7 +1584,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                *id = 0;
                return 0;
        }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        case VIDIOCSTUNER:
        {
                struct video_tuner *v = arg;
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index dbb75a7db199..56246b8578f3 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -362,7 +362,7 @@ int msp_sleep(struct msp_state *state, int timeout)
 }
 /* ------------------------------------------------------------------------ */
+#ifdef CONFIG_VIDEO_V4L1
 static int msp_mode_v4l2_to_v4l1(int rxsubchans, int audmode)
 {
        if (rxsubchans == V4L2_TUNER_SUB_MONO)
@@ -384,6 +384,7 @@ static int msp_mode_v4l1_to_v4l2(int mode)
                return V4L2_TUNER_MODE_LANG1;
        return V4L2_TUNER_MODE_MONO;
 }
+#endif
 static int msp_get_ctrl(struct i2c_client *client, struct v4l2_control *ctrl)
 {
@@ -509,6 +510,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
        /* --- v4l ioctls --- */
        /* take care: bttv does userspace copying, we'll get a
           kernel pointer here... */
+#ifdef CONFIG_VIDEO_V4L1
        case VIDIOCGAUDIO:
        {
                struct video_audio *va = arg;
@@ -577,6 +579,12 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
        }
        case VIDIOCSFREQ:
+        {
+                /* new channel -- kick audio carrier scan */
+                msp_wake_thread(client);
+                break;
+        }
+#endif
        case VIDIOC_S_FREQUENCY:
        {
                /* new channel -- kick audio carrier scan */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 9b48abcf6089..be1e5cc78081 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -852,7 +852,6 @@ unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *hdw)
        return hdw->serial_number;
 }
 int pvr2_hdw_get_unit_number(struct pvr2_hdw *hdw)
 {
        return hdw->unit_number;
@@ -2318,7 +2317,6 @@ void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *hdw)
        }
 }
 /* Return name for this driver instance */
 const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw)
 {
@@ -2542,6 +2540,10 @@ static void pvr2_ctl_timeout(unsigned long data)
 }
+/* Issue a command and get a response from the device.  This extended
+   version includes a probe flag (which if set means that device errors
+   should not be logged or treated as fatal) and a timeout in jiffies.
+   This can be used to non-lethally probe the health of endpoint 1. */
 static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
                                unsigned int timeout,int probe_fl,
                                void *write_data,unsigned int write_len,
@@ -2970,6 +2972,7 @@ int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw)
 }
+/* Stop / start video stream transport */
 static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)
 {
        int status;
@@ -3068,6 +3071,7 @@ int pvr2_hdw_gpio_chg_out(struct pvr2_hdw *hdw,u32 msk,u32 val)
 }
+/* Find I2C address of eeprom */
 static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)
 {
        int result;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 681f79c8064e..1e393762546c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -26,6 +26,8 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
+static const char *pvr2_buffer_state_decode(enum pvr2_buffer_state);
 #define BUFFER_SIG 0x47653271
 // #define SANITY_CHECK_BUFFERS
@@ -515,6 +517,10 @@ void pvr2_stream_set_callback(struct pvr2_stream *sp,
 }
 /* Query / set the nominal buffer count */
+int pvr2_stream_get_buffer_count(struct pvr2_stream *sp)
+{
+        return sp->buffer_target_count;
+}
 int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt)
 {
@@ -553,7 +559,6 @@ int pvr2_stream_get_ready_count(struct pvr2_stream *sp)
        return sp->r_count;
 }
 void pvr2_stream_kill(struct pvr2_stream *sp)
 {
        struct pvr2_buffer *bp;
@@ -607,7 +612,6 @@ int pvr2_buffer_queue(struct pvr2_buffer *bp)
        return ret;
 }
 int pvr2_buffer_set_buffer(struct pvr2_buffer *bp,void *ptr,unsigned int cnt)
 {
        int ret = 0;
@@ -646,7 +650,6 @@ int pvr2_buffer_get_status(struct pvr2_buffer *bp)
        return bp->status;
 }
 int pvr2_buffer_get_id(struct pvr2_buffer *bp)
 {
        return bp->id;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/video/pvrusb2/pvrusb2-io.h
index 96285ad234a6..93279cc2a35e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.h
@@ -47,6 +47,7 @@ void pvr2_stream_set_callback(struct pvr2_stream *,
                              void *data);
 /* Query / set the nominal buffer count */
+int pvr2_stream_get_buffer_count(struct pvr2_stream *);
 int pvr2_stream_set_buffer_count(struct pvr2_stream *,unsigned int);
 /* Get a pointer to a buffer that is either idle, ready, or is specified
@@ -58,6 +59,7 @@ struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id);
 /* Find out how many buffers are idle or ready */
 int pvr2_stream_get_ready_count(struct pvr2_stream *);
 /* Kill all pending buffers and throw away any ready buffers as well */
 void pvr2_stream_kill(struct pvr2_stream *);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index f7a2e225a002..b71f9a961f8a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -213,7 +213,9 @@ int pvr2_ioread_setup(struct pvr2_ioread *cp,struct pvr2_stream *sp)
                                   " pvr2_ioread_setup (tear-down) id=%p",cp);
                        pvr2_ioread_stop(cp);
                        pvr2_stream_kill(cp->stream);
-                        pvr2_stream_set_buffer_count(cp->stream,0);
+                        if (pvr2_stream_get_buffer_count(cp->stream)) {
+                                pvr2_stream_set_buffer_count(cp->stream,0);
+                        }
                        cp->stream = NULL;
                }
                if (sp) {
@@ -251,7 +253,6 @@ int pvr2_ioread_set_enabled(struct pvr2_ioread *cp,int fl)
        return ret;
 }
 static int pvr2_ioread_get_buffer(struct pvr2_ioread *cp)
 {
        int stat;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 6af55a8b6f05..d1dda5caf406 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -44,12 +44,16 @@ struct pvr2_sysfs {
        struct kobj_type ktype;
        struct class_device_attribute attr_v4l_minor_number;
        struct class_device_attribute attr_unit_number;
+        int v4l_minor_number_created_ok;
+        int unit_number_created_ok;
 };
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 struct pvr2_sysfs_debugifc {
        struct class_device_attribute attr_debugcmd;
        struct class_device_attribute attr_debuginfo;
+        int debugcmd_created_ok;
+        int debuginfo_created_ok;
 };
 #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
@@ -67,6 +71,7 @@ struct pvr2_sysfs_ctl_item {
        struct pvr2_sysfs_ctl_item *item_next;
        struct attribute *attr_gen[7];
        struct attribute_group grp;
+        int created_ok;
        char name[80];
 };
@@ -487,6 +492,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
        struct pvr2_sysfs_func_set *fp;
        struct pvr2_ctrl *cptr;
        unsigned int cnt,acnt;
+        int ret;
        if ((ctl_id < 0) || (ctl_id >= (sizeof(funcs)/sizeof(funcs[0])))) {
                return;
@@ -589,7 +595,13 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
        cip->grp.name = cip->name;
        cip->grp.attrs = cip->attr_gen;
-        sysfs_create_group(&sfp->class_dev->kobj,&cip->grp);
+        ret = sysfs_create_group(&sfp->class_dev->kobj,&cip->grp);
+        if (ret) {
+                printk(KERN_WARNING "%s: sysfs_create_group error: %d\n",
+                       __FUNCTION__, ret);
+                return;
+        }
+        cip->created_ok = !0;
 }
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
@@ -600,6 +612,8 @@ static ssize_t debugcmd_store(struct class_device *,const char *,size_t count);
 static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
 {
        struct pvr2_sysfs_debugifc *dip;
+        int ret;
        dip = kmalloc(sizeof(*dip),GFP_KERNEL);
        if (!dip) return;
        memset(dip,0,sizeof(*dip));
@@ -613,17 +627,34 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
        dip->attr_debuginfo.attr.mode = S_IRUGO;
        dip->attr_debuginfo.show = debuginfo_show;
        sfp->debugifc = dip;
-        class_device_create_file(sfp->class_dev,&dip->attr_debugcmd);
+        ret = class_device_create_file(sfp->class_dev,&dip->attr_debugcmd);
-        class_device_create_file(sfp->class_dev,&dip->attr_debuginfo);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: class_device_create_file error: %d\n",
+                       __FUNCTION__, ret);
+        } else {
+                dip->debugcmd_created_ok = !0;
+        }
+        ret = class_device_create_file(sfp->class_dev,&dip->attr_debuginfo);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: class_device_create_file error: %d\n",
+                       __FUNCTION__, ret);
+        } else {
+                dip->debuginfo_created_ok = !0;
+        }
 }
 static void pvr2_sysfs_tear_down_debugifc(struct pvr2_sysfs *sfp)
 {
        if (!sfp->debugifc) return;
-        class_device_remove_file(sfp->class_dev,
+        if (sfp->debugifc->debuginfo_created_ok) {
-                                 &sfp->debugifc->attr_debuginfo);
+                class_device_remove_file(sfp->class_dev,
-        class_device_remove_file(sfp->class_dev,&sfp->debugifc->attr_debugcmd);
+                                         &sfp->debugifc->attr_debuginfo);
+        }
+        if (sfp->debugifc->debugcmd_created_ok) {
+                class_device_remove_file(sfp->class_dev,
+                                         &sfp->debugifc->attr_debugcmd);
+        }
        kfree(sfp->debugifc);
        sfp->debugifc = NULL;
 }
@@ -645,7 +676,9 @@ static void pvr2_sysfs_tear_down_controls(struct pvr2_sysfs *sfp)
        struct pvr2_sysfs_ctl_item *cip1,*cip2;
        for (cip1 = sfp->item_first; cip1; cip1 = cip2) {
                cip2 = cip1->item_next;
-                sysfs_remove_group(&sfp->class_dev->kobj,&cip1->grp);
+                if (cip1->created_ok) {
+                        sysfs_remove_group(&sfp->class_dev->kobj,&cip1->grp);
+                }
                pvr2_sysfs_trace("Destroying pvr2_sysfs_ctl_item id=%p",cip1);
                kfree(cip1);
        }
@@ -675,8 +708,14 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp)
        pvr2_sysfs_tear_down_debugifc(sfp);
 #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
        pvr2_sysfs_tear_down_controls(sfp);
-        class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number);
+        if (sfp->v4l_minor_number_created_ok) {
-        class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number);
+                class_device_remove_file(sfp->class_dev,
+                                         &sfp->attr_v4l_minor_number);
+        }
+        if (sfp->unit_number_created_ok) {
+                class_device_remove_file(sfp->class_dev,
+                                         &sfp->attr_unit_number);
+        }
        pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev);
        sfp->class_dev->class_data = NULL;
        class_device_unregister(sfp->class_dev);
@@ -709,6 +748,8 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
 {
        struct usb_device *usb_dev;
        struct class_device *class_dev;
+        int ret;
        usb_dev = pvr2_hdw_get_dev(sfp->channel.hdw);
        if (!usb_dev) return;
        class_dev = kmalloc(sizeof(*class_dev),GFP_KERNEL);
@@ -733,20 +774,40 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
        sfp->class_dev = class_dev;
        class_dev->class_data = sfp;
-        class_device_register(class_dev);
+        ret = class_device_register(class_dev);
+        if (ret) {
+                printk(KERN_ERR "%s: class_device_register failed\n",
+                       __FUNCTION__);
+                kfree(class_dev);
+                return;
+        }
        sfp->attr_v4l_minor_number.attr.owner = THIS_MODULE;
        sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number";
        sfp->attr_v4l_minor_number.attr.mode = S_IRUGO;
        sfp->attr_v4l_minor_number.show = v4l_minor_number_show;
        sfp->attr_v4l_minor_number.store = NULL;
-        class_device_create_file(sfp->class_dev,&sfp->attr_v4l_minor_number);
+        ret = class_device_create_file(sfp->class_dev,
+                                       &sfp->attr_v4l_minor_number);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: class_device_create_file error: %d\n",
+                       __FUNCTION__, ret);
+        } else {
+                sfp->v4l_minor_number_created_ok = !0;
+        }
        sfp->attr_unit_number.attr.owner = THIS_MODULE;
        sfp->attr_unit_number.attr.name = "unit_number";
        sfp->attr_unit_number.attr.mode = S_IRUGO;
        sfp->attr_unit_number.show = unit_number_show;
        sfp->attr_unit_number.store = NULL;
-        class_device_create_file(sfp->class_dev,&sfp->attr_unit_number);
+        ret = class_device_create_file(sfp->class_dev,&sfp->attr_unit_number);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: class_device_create_file error: %d\n",
+                       __FUNCTION__, ret);
+        } else {
+                sfp->unit_number_created_ok = !0;
+        }
        pvr2_sysfs_add_controls(sfp);
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index f1fd69e7f119..d73cff1970ae 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -997,9 +997,9 @@ static int saa7134_alsa_init(void)
        struct saa7134_dev *dev = NULL;
        struct list_head *list;
-        if (!dmasound_init && !dmasound_exit) {
+        if (!saa7134_dmasound_init && !saa7134_dmasound_exit) {
-                dmasound_init = alsa_device_init;
+                saa7134_dmasound_init = alsa_device_init;
-                dmasound_exit = alsa_device_exit;
+                saa7134_dmasound_exit = alsa_device_exit;
        } else {
                printk(KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n");
                return -EBUSY;
@@ -1036,8 +1036,8 @@ static void saa7134_alsa_exit(void)
                snd_card_free(snd_saa7134_cards[idx]);
        }
-        dmasound_init = NULL;
+        saa7134_dmasound_init = NULL;
-        dmasound_exit = NULL;
+        saa7134_dmasound_exit = NULL;
        printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
        return;
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 6e97cc84ba89..be3a81fc90a2 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -95,8 +95,8 @@ LIST_HEAD(saa7134_devlist);
 static LIST_HEAD(mops_list);
 static unsigned int saa7134_devcount;
-int (*dmasound_init)(struct saa7134_dev *dev);
+int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
-int (*dmasound_exit)(struct saa7134_dev *dev);
+int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 #define dprintk(fmt, arg...)    if (core_debug) \
        printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg)
@@ -1008,8 +1008,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        /* check for signal */
        saa7134_irq_video_intl(dev);
-        if (dmasound_init && !dev->dmasound.priv_data) {
+        if (saa7134_dmasound_init && !dev->dmasound.priv_data) {
-                dmasound_init(dev);
+                saa7134_dmasound_init(dev);
        }
        return 0;
@@ -1036,8 +1036,8 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
        struct saa7134_mpeg_ops *mops;
        /* Release DMA sound modules if present */
-        if (dmasound_exit && dev->dmasound.priv_data) {
+        if (saa7134_dmasound_exit && dev->dmasound.priv_data) {
-                dmasound_exit(dev);
+                saa7134_dmasound_exit(dev);
        }
        /* debugging ... */
@@ -1169,8 +1169,8 @@ EXPORT_SYMBOL(saa7134_boards);
 /* ----------------- for the DMA sound modules --------------- */
-EXPORT_SYMBOL(dmasound_init);
+EXPORT_SYMBOL(saa7134_dmasound_init);
-EXPORT_SYMBOL(dmasound_exit);
+EXPORT_SYMBOL(saa7134_dmasound_exit);
 EXPORT_SYMBOL(saa7134_pgtable_free);
 EXPORT_SYMBOL(saa7134_pgtable_build);
 EXPORT_SYMBOL(saa7134_pgtable_alloc);
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 3895d05804ae..2e3ba5f31453 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -993,9 +993,9 @@ static int saa7134_oss_init(void)
        struct saa7134_dev *dev = NULL;
        struct list_head *list;
-        if (!dmasound_init && !dmasound_exit) {
+        if (!saa7134_dmasound_init && !saa7134_dmasound_exit) {
-                dmasound_init = oss_device_init;
+                saa7134_dmasound_init = oss_device_init;
-                dmasound_exit = oss_device_exit;
+                saa7134_dmasound_exit = oss_device_exit;
        } else {
                printk(KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n");
                return -EBUSY;
@@ -1037,8 +1037,8 @@ static void saa7134_oss_exit(void)
        }
-        dmasound_init = NULL;
+        saa7134_dmasound_init = NULL;
-        dmasound_exit = NULL;
+        saa7134_dmasound_exit = NULL;
        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index e4156ec9c6d7..8656f2400e18 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -40,7 +40,7 @@
 static unsigned int video_debug   = 0;
 static unsigned int gbuffers      = 8;
-static unsigned int noninterlaced = 0;
+static unsigned int noninterlaced = 1;
 static unsigned int gbufsize      = 720*576*4;
 static unsigned int gbufsize_max  = 720*576*4;
 module_param(video_debug, int, 0644);
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
 module_param(gbuffers, int, 0444);
 MODULE_PARM_DESC(gbuffers,"number of capture buffers, range 2-32");
 module_param(noninterlaced, int, 0644);
-MODULE_PARM_DESC(noninterlaced,"video input is noninterlaced");
+MODULE_PARM_DESC(noninterlaced,"capture non interlaced video");
 #define dprintk(fmt, arg...)    if (video_debug) \
        printk(KERN_DEBUG "%s/video: " fmt, dev->name , ## arg)
@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                struct v4l2_format *f = arg;
                return saa7134_try_fmt(dev,fh,f);
        }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        case VIDIOCGMBUF:
        {
                struct video_mbuf *mbuf = arg;
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index d5ee99c574cc..c04ce6152fd5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -586,8 +586,8 @@ void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf);
 int saa7134_set_dmabits(struct saa7134_dev *dev);
-extern int (*dmasound_init)(struct saa7134_dev *dev);
+extern int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
-extern int (*dmasound_exit)(struct saa7134_dev *dev);
+extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index b36ba9fa3a28..5686547ba76a 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -2181,7 +2181,6 @@ static struct pci_device_id stradis_pci_tbl[] = {
        { 0 }
 };
-MODULE_DEVICE_TABLE(pci, stradis_pci_tbl);
 static struct pci_driver stradis_driver = {
        .name = "stradis",
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index f7eb402d5f2b..40590bae5ff7 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -196,14 +196,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                i2c_master_send(c, buffer, 4);
                default_tuner_init(c);
                break;
-        case TUNER_LG_TDVS_H06XF:
-                /* Set the Auxiliary Byte. */
-                buffer[2] &= ~0x20;
-                buffer[2] |= 0x18;
-                buffer[3] = 0x20;
-                i2c_master_send(c, buffer, 4);
-                default_tuner_init(c);
-                break;
        case TUNER_PHILIPS_TD1316:
                buffer[0] = 0x0b;
                buffer[1] = 0xdc;
@@ -598,6 +590,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                if (t->standby)
                        t->standby (client);
                break;
+#ifdef CONFIG_VIDEO_V4L1
        case VIDIOCSAUDIO:
                if (check_mode(t, "VIDIOCSAUDIO") == EINVAL)
                        return 0;
@@ -607,17 +600,6 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                /* Should be implemented, since bttv calls it */
                tuner_dbg("VIDIOCSAUDIO not implemented.\n");
                break;
-        case TDA9887_SET_CONFIG:
-                if (t->type == TUNER_TDA9887) {
-                        int *i = arg;
-                        t->tda9887_config = *i;
-                        set_freq(client, t->tv_freq);
-                }
-                break;
-        /* --- v4l ioctls --- */
-        /* take care: bttv does userspace copying, we'll get a
-           kernel pointer here... */
        case VIDIOCSCHAN:
                {
                        static const v4l2_std_id map[] = {
@@ -701,7 +683,18 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                                    ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
                        return 0;
                }
+#endif
+        case TDA9887_SET_CONFIG:
+                if (t->type == TUNER_TDA9887) {
+                        int *i = arg;
+                        t->tda9887_config = *i;
+                        set_freq(client, t->tv_freq);
+                }
+                break;
+        /* --- v4l ioctls --- */
+        /* take care: bttv does userspace copying, we'll get a
+           kernel pointer here... */
        case VIDIOC_S_STD:
                {
                        v4l2_std_id *id = arg;
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index d071c5cbf013..abe37cf632c6 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -339,7 +339,20 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
        if (4 != (rc = i2c_master_send(c,buffer,4)))
                tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
-        if (t->type == TUNER_MICROTUNE_4042FI5) {
+        switch (t->type) {
+        case TUNER_LG_TDVS_H06XF:
+                /* Set the Auxiliary Byte. */
+                buffer[0] = buffer[2];
+                buffer[0] &= ~0x20;
+                buffer[0] |= 0x18;
+                buffer[1] = 0x20;
+                tuner_dbg("tv 0x%02x 0x%02x\n",buffer[0],buffer[1]);
+                if (2 != (rc = i2c_master_send(c,buffer,2)))
+                        tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+                break;
+        case TUNER_MICROTUNE_4042FI5:
+        {
                // FIXME - this may also work for other tuners
                unsigned long timeout = jiffies + msecs_to_jiffies(1);
                u8 status_byte = 0;
@@ -364,10 +377,12 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                buffer[2] = config;
                buffer[3] = cb;
                tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
-                       buffer[0],buffer[1],buffer[2],buffer[3]);
+                          buffer[0],buffer[1],buffer[2],buffer[3]);
                if (4 != (rc = i2c_master_send(c,buffer,4)))
                        tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
+                break;
+        }
        }
 }
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index 59fb899f31f3..a0fd82b924f2 100644
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 config USB_VICAM
        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_V4L1 && EXPERIMENTAL
+        depends on USB && VIDEO_DEV && VIDEO_V4L1 && EXPERIMENTAL
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 config USB_IBMCAM
        tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_V4L1
+        depends on USB && VIDEO_DEV && VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 config USB_KONICAWC
        tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_V4L1
+        depends on USB && VIDEO_DEV && VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want support for webcams based on a Konica
@@ -39,7 +39,7 @@ config USB_KONICAWC
 config USB_QUICKCAM_MESSENGER
        tristate "USB Logitech Quickcam Messenger"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_DEV && VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y or M here to enable support for the USB Logitech Quickcam
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index f06dc19e504a..2ecbeffb559e 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -202,7 +202,7 @@ static char *v4l2_memory_names[] = {
 /* ------------------------------------------------------------------ */
 /* debug help functions                                               */
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
 static const char *v4l1_ioctls[] = {
        [_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",
        [_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
@@ -301,7 +301,7 @@ static const char *v4l2_ioctls[] = {
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
 static const char *v4l2_int_ioctls[] = {
-#ifdef HAVE_VIDEO_DECODER
+#ifdef CONFIG_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",
@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd)
                       (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?
                       v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
                break;
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        case 'v':
                printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",
                       (_IOC_NR(cmd) < V4L1_IOCTLS) ?
@@ -414,6 +414,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                printk ("%s: tuner type=%d\n", s, *p);
                break;
        }
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
        case DECODER_SET_VBI_BYPASS:
        case DECODER_ENABLE_OUTPUT:
        case DECODER_GET_STATUS:
@@ -424,6 +425,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
        case VIDIOCCAPTURE:
        case VIDIOCSYNC:
        case VIDIOCSWRITEMODE:
+#endif
        case TUNER_SET_TYPE_ADDR:
        case TUNER_SET_STANDBY:
        case TDA9887_SET_CONFIG:
@@ -755,6 +757,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                                p->afc);
                break;
        }
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
        case VIDIOCGVBIFMT:
        case VIDIOCSVBIFMT:
        {
@@ -924,6 +927,14 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                                p->clipcount);
                break;
        }
+        case VIDIOCGFREQ:
+        case VIDIOCSFREQ:
+        {
+                unsigned long *p=arg;
+                printk ("%s: value=%lu\n", s, *p);
+                break;
+        }
+#endif
        case VIDIOC_INT_AUDIO_CLOCK_FREQ:
        case VIDIOC_INT_I2S_CLOCK_FREQ:
        case VIDIOC_INT_S_STANDBY:
@@ -933,13 +944,6 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                printk ("%s: value=%d\n", s, *p);
                break;
        }
-        case VIDIOCGFREQ:
-        case VIDIOCSFREQ:
-        {
-                unsigned long *p=arg;
-                printk ("%s: value=%lu\n", s, *p);
-                break;
-        }
        case VIDIOC_G_STD:
        case VIDIOC_S_STD:
        case VIDIOC_QUERYSTD:
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index b26ebaff226f..0fc90cd393f6 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                ret=vfd->vidioc_overlay(file, fh, *i);
                break;
        }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        /* --- streaming capture ------------------------------------- */
        case VIDIOCGMBUF:
        {
@@ -1512,6 +1512,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
        int i=0;
        int base;
        int end;
+        int ret;
        char *name_base;
        switch(type)
@@ -1537,6 +1538,8 @@ int video_register_device(struct video_device *vfd, int type, int nr)
                        name_base = "radio";
                        break;
                default:
+                        printk(KERN_ERR "%s called with unknown type: %d\n",
+                               __FUNCTION__, type);
                        return -1;
        }
@@ -1571,9 +1574,18 @@ int video_register_device(struct video_device *vfd, int type, int nr)
        vfd->class_dev.class       = &video_class;
        vfd->class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd->minor);
        sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
-        class_device_register(&vfd->class_dev);
+        ret = class_device_register(&vfd->class_dev);
-        class_device_create_file(&vfd->class_dev,
+        if (ret < 0) {
-                                &class_device_attr_name);
+                printk(KERN_ERR "%s: class_device_register failed\n",
+                       __FUNCTION__);
+                goto fail_minor;
+        }
+        ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: class_device_create_file 'name' failed\n",
+                       __FUNCTION__);
+                goto fail_classdev;
+        }
 #if 1
        /* needed until all drivers are fixed */
@@ -1583,6 +1595,15 @@ int video_register_device(struct video_device *vfd, int type, int nr)
                       "http://lwn.net/Articles/36850/\n", vfd->name);
 #endif
        return 0;
+fail_classdev:
+        class_device_unregister(&vfd->class_dev);
+fail_minor:
+        mutex_lock(&videodev_lock);
+        video_device[vfd->minor] = NULL;
+        vfd->minor = -1;
+        mutex_unlock(&videodev_lock);
+        return ret;
 }
 /**
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 41d23c8acbd8..38bd0c1018c2 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -986,7 +986,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
                                file->f_flags & O_NONBLOCK));
 }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
 static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
 {
        struct vivi_fh  *fh=priv;
@@ -1328,7 +1328,7 @@ static struct video_device vivi = {
        .vidioc_s_ctrl        = vidioc_s_ctrl,
        .vidioc_streamon      = vidioc_streamon,
        .vidioc_streamoff     = vidioc_streamoff,
-#ifdef HAVE_V4L1
+#ifdef CONFIG_V4L1_COMPAT
        .vidiocgmbuf          = vidiocgmbuf,
 #endif
        .tvnorms              = tvnorms,
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index b14e89004c3a..0a0e0cd81a23 100644
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -29,7 +29,7 @@ config ATALK
          even politically correct people are allowed to say Y here.
 config DEV_APPLETALK
-        bool "Appletalk interfaces support"
+        tristate "Appletalk interfaces support"
        depends on ATALK
        help
          AppleTalk is the protocol that Apple computers can use to communicate
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index da62db897426..627f224d78bc 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3127,7 +3127,7 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
                break;
        }
-        /* NOTE: dev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
         * means we reserve 2 more, this pushes us to allocate from the next
         * larger slab size
         * i.e. RXBUFFER_2048 --> size-4096 slab */
@@ -3708,7 +3708,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 #define E1000_CB_LENGTH 256
                if (length < E1000_CB_LENGTH) {
                        struct sk_buff *new_skb =
-                            dev_alloc_skb(length + NET_IP_ALIGN);
+                            netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
                        if (new_skb) {
                                skb_reserve(new_skb, NET_IP_ALIGN);
                                new_skb->dev = netdev;
@@ -3979,7 +3979,7 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
        while (cleaned_count--) {
                if (!(skb = buffer_info->skb))
-                        skb = dev_alloc_skb(bufsz);
+                        skb = netdev_alloc_skb(netdev, bufsz);
                else {
                        skb_trim(skb, 0);
                        goto map_skb;
@@ -3997,7 +3997,7 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                        DPRINTK(RX_ERR, ERR, "skb align check failed: %u bytes "
                                             "at %p\n", bufsz, skb->data);
                        /* Try again, without freeing the previous */
-                        skb = dev_alloc_skb(bufsz);
+                        skb = netdev_alloc_skb(netdev, bufsz);
                        /* Failed allocation, critical failure */
                        if (!skb) {
                                dev_kfree_skb(oldskb);
@@ -4121,7 +4121,8 @@ e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                                rx_desc->read.buffer_addr[j+1] = ~0;
                }
-                skb = dev_alloc_skb(adapter->rx_ps_bsize0 + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(netdev,
+                                       adapter->rx_ps_bsize0 + NET_IP_ALIGN);
                if (unlikely(!skb)) {
                        adapter->alloc_rx_buff_failed++;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 1b8138f641e3..6f97962dd06b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.63"
+#define DRV_MODULE_VERSION      "3.64"
-#define DRV_MODULE_RELDATE      "July 25, 2006"
+#define DRV_MODULE_RELDATE      "July 31, 2006"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -3097,7 +3097,7 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key,
         * Callers depend upon this behavior and assume that
         * we leave everything unchanged if we fail.
         */
-        skb = dev_alloc_skb(skb_size);
+        skb = netdev_alloc_skb(tp->dev, skb_size);
        if (skb == NULL)
                return -ENOMEM;
@@ -3270,7 +3270,7 @@ static int tg3_rx(struct tg3 *tp, int budget)
                        tg3_recycle_rx(tp, opaque_key,
                                       desc_idx, *post_ptr);
-                        copy_skb = dev_alloc_skb(len + 2);
+                        copy_skb = netdev_alloc_skb(tp->dev, len + 2);
                        if (copy_skb == NULL)
                                goto drop_it_no_recycle;
@@ -8618,7 +8618,7 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
        err = -EIO;
        tx_len = 1514;
-        skb = dev_alloc_skb(tx_len);
+        skb = netdev_alloc_skb(tp->dev, tx_len);
        if (!skb)
                return -ENOMEM;
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 622b3f8ba820..f8ae2b7db0a7 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -61,7 +61,7 @@ struct pci_bus * __devinit pci_find_bus(int domain, int busnr)
 * @from: Previous PCI bus found, or %NULL for new search.
 *
 * Iterates through the list of known PCI busses.  A new search is
- * initiated by passing %NULL to the @from argument.  Otherwise if
+ * initiated by passing %NULL as the @from argument.  Otherwise if
 * @from is not %NULL, searches continue from next device on the
 * global list.
 */
@@ -148,13 +148,14 @@ struct pci_dev * pci_get_slot(struct pci_bus *bus, unsigned int devfn)
 * @from: Previous PCI device found in search, or %NULL for new search.
 *
 * Iterates through the list of known PCI devices.  If a PCI device is
- * found with a matching @vendor, @device, @ss_vendor and @ss_device, a pointer to its
+ * found with a matching @vendor, @device, @ss_vendor and @ss_device, a
- * device structure is returned.  Otherwise, %NULL is returned.
+ * pointer to its device structure is returned.  Otherwise, %NULL is returned.
- * A new search is initiated by passing %NULL to the @from argument.
+ * A new search is initiated by passing %NULL as the @from argument.
- * Otherwise if @from is not %NULL, searches continue from next device on the global list.
+ * Otherwise if @from is not %NULL, searches continue from next device
+ * on the global list.
 *
- * NOTE: Do not use this function anymore, use pci_get_subsys() instead, as
+ * NOTE: Do not use this function any more; use pci_get_subsys() instead, as
- * the pci device returned by this function can disappear at any moment in
+ * the PCI device returned by this function can disappear at any moment in
 * time.
 */
 static struct pci_dev * pci_find_subsys(unsigned int vendor,
@@ -191,14 +192,15 @@ exit:
 * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids
 * @from: Previous PCI device found in search, or %NULL for new search.
 *
- * Iterates through the list of known PCI devices.  If a PCI device is
+ * Iterates through the list of known PCI devices.  If a PCI device is found
- * found with a matching @vendor and @device, a pointer to its device structure is
+ * with a matching @vendor and @device, a pointer to its device structure is
 * returned.  Otherwise, %NULL is returned.
- * A new search is initiated by passing %NULL to the @from argument.
+ * A new search is initiated by passing %NULL as the @from argument.
- * Otherwise if @from is not %NULL, searches continue from next device on the global list.
+ * Otherwise if @from is not %NULL, searches continue from next device
+ * on the global list.
 * 
- * NOTE: Do not use this function anymore, use pci_get_device() instead, as
+ * NOTE: Do not use this function any more; use pci_get_device() instead, as
- * the pci device returned by this function can disappear at any moment in
+ * the PCI device returned by this function can disappear at any moment in
 * time.
 */
 struct pci_dev *
@@ -215,11 +217,11 @@ pci_find_device(unsigned int vendor, unsigned int device, const struct pci_dev *
 * @ss_device: PCI subsystem device id to match, or %PCI_ANY_ID to match all device ids
 * @from: Previous PCI device found in search, or %NULL for new search.
 *
- * Iterates through the list of known PCI devices.  If a PCI device is
+ * Iterates through the list of known PCI devices.  If a PCI device is found
- * found with a matching @vendor, @device, @ss_vendor and @ss_device, a pointer to its
+ * with a matching @vendor, @device, @ss_vendor and @ss_device, a pointer to its
 * device structure is returned, and the reference count to the device is
 * incremented.  Otherwise, %NULL is returned.  A new search is initiated by
- * passing %NULL to the @from argument.  Otherwise if @from is not %NULL,
+ * passing %NULL as the @from argument.  Otherwise if @from is not %NULL,
 * searches continue from next device on the global list.
 * The reference count for @from is always decremented if it is not %NULL.
 */
@@ -262,7 +264,7 @@ exit:
 * found with a matching @vendor and @device, the reference count to the
 * device is incremented and a pointer to its device structure is returned.
 * Otherwise, %NULL is returned.  A new search is initiated by passing %NULL
- * to the @from argument.  Otherwise if @from is not %NULL, searches continue
+ * as the @from argument.  Otherwise if @from is not %NULL, searches continue
 * from next device on the global list.  The reference count for @from is
 * always decremented if it is not %NULL.
 */
@@ -279,11 +281,13 @@ pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from)
 * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids
 * @from: Previous PCI device found in search, or %NULL for new search.
 *
- * Iterates through the list of known PCI devices in the reverse order of pci_find_device().
+ * Iterates through the list of known PCI devices in the reverse order of
+ * pci_find_device().
 * If a PCI device is found with a matching @vendor and @device, a pointer to
 * its device structure is returned.  Otherwise, %NULL is returned.
- * A new search is initiated by passing %NULL to the @from argument.
+ * A new search is initiated by passing %NULL as the @from argument.
- * Otherwise if @from is not %NULL, searches continue from previous device on the global list.
+ * Otherwise if @from is not %NULL, searches continue from previous device
+ * on the global list.
 */
 struct pci_dev *
 pci_find_device_reverse(unsigned int vendor, unsigned int device, const struct pci_dev *from)
@@ -317,7 +321,7 @@ exit:
 * found with a matching @class, the reference count to the device is
 * incremented and a pointer to its device structure is returned.
 * Otherwise, %NULL is returned.
- * A new search is initiated by passing %NULL to the @from argument.
+ * A new search is initiated by passing %NULL as the @from argument.
 * Otherwise if @from is not %NULL, searches continue from next device
 * on the global list.  The reference count for @from is always decremented
 * if it is not %NULL.
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 738b1ef595a3..9ad18e62658d 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -601,12 +601,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
            ret = CS_BAD_ARGS;
        else {
            struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function);
-            if (p_dev == NULL)
+            ret = pccard_get_configuration_info(s, p_dev, &buf->config);
-                    ret = CS_BAD_ARGS;
+            pcmcia_put_dev(p_dev);
-            else {
-                    ret = pccard_get_configuration_info(s, p_dev, &buf->config);
-                    pcmcia_put_dev(p_dev);
-            }
        }
        break;
    case DS_GET_FIRST_TUPLE:
@@ -636,12 +632,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
                    ret = CS_BAD_ARGS;
            else {
                    struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function);
-                    if (p_dev == NULL)
+                    ret = pccard_get_status(s, p_dev, &buf->status);
-                            ret = CS_BAD_ARGS;
+                    pcmcia_put_dev(p_dev);
-                    else {
-                            ret = pccard_get_status(s, p_dev, &buf->status);
-                            pcmcia_put_dev(p_dev);
-                    }
            }
            break;
    case DS_VALIDATE_CIS:
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 7bf25b88ea31..c8323399e9e4 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -245,10 +245,17 @@ int pccard_get_configuration_info(struct pcmcia_socket *s,
                return CS_SUCCESS;
        }
-        /* !!! This is a hack !!! */
+        config->Attributes = c->Attributes | CONF_VALID_CLIENT;
-        memcpy(&config->Attributes, &c->Attributes, sizeof(config_t));
+        config->Vcc = s->socket.Vcc;
-        config->Attributes |= CONF_VALID_CLIENT;
+        config->Vpp1 = config->Vpp2 = s->socket.Vpp;
-        config->CardValues = c->CardValues;
+        config->IntType = c->IntType;
+        config->ConfigBase = c->ConfigBase;
+        config->Status = c->Status;
+        config->Pin = c->Pin;
+        config->Copy = c->Copy;
+        config->Option = c->Option;
+        config->ExtStatus = c->ExtStatus;
+        config->Present = config->CardValues = c->CardValues;
        config->IRQAttributes = c->irq.Attributes;
        config->AssignedIRQ = s->irq.AssignedIRQ;
        config->BasePort1 = c->io.BasePort1;
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index b154b3f52cbe..551f58e29810 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -346,7 +346,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
        dev->flags = node->flags;
        if (!(dev->flags & PNPBIOS_NO_CONFIG))
                dev->capabilities |= PNP_CONFIGURABLE;
-        if (!(dev->flags & PNPBIOS_NO_DISABLE))
+        if (!(dev->flags & PNPBIOS_NO_DISABLE) && pnpbios_is_dynamic(dev))
                dev->capabilities |= PNP_DISABLE;
        dev->capabilities |= PNP_READ;
        if (pnpbios_is_dynamic(dev))
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 35058f9296d8..f5734a97580a 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -1076,14 +1076,8 @@ static void ahci_host_intr(struct ata_port *ap)
                return;
        /* ignore interim PIO setup fis interrupts */
-        if (ata_tag_valid(ap->active_tag)) {
+        if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 
-                struct ata_queued_cmd *qc =
+                return;
-                        ata_qc_from_tag(ap, ap->active_tag);
-                if (qc && qc->tf.protocol == ATA_PROT_PIO &&
-                    (status & PORT_IRQ_PIOS_FIS))
-                        return;
-        }
        if (ata_ratelimit())
                ata_port_printk(ap, KERN_INFO, "spurious interrupt "
diff --git a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile
index 8c91fda6482c..b98c5c1056c3 100644
--- a/drivers/scsi/aic7xxx/aicasm/Makefile
+++ b/drivers/scsi/aic7xxx/aicasm/Makefile
@@ -14,6 +14,8 @@ LIBS=	-ldb
 clean-files:= ${GENSRCS} ${GENHDRS} $(YSRCS:.y=.output) $(PROG)
 # Override default kernel CFLAGS.  This is a userland app.
 AICASM_CFLAGS:= -I/usr/include -I.
+LEX= flex
+YACC= bison
 YFLAGS= -d
 NOMAN=  noman
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 2ee742d40c43..005043197527 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -24,7 +24,7 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_S3C2410
        default y if PXA27x
        default y if ARCH_EP93XX
-        default y if ARCH_AT91RM9200
+        default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index f7bdd94b3aa8..218621b9958e 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -517,19 +517,19 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, unsig
 static struct usb_device *usbdev_lookup_minor(int minor)
 {
-        struct device *device;
+        struct class_device *class_dev;
-        struct usb_device *udev = NULL;
+        struct usb_device *dev = NULL;
        down(&usb_device_class->sem);
-        list_for_each_entry(device, &usb_device_class->devices, node) {
+        list_for_each_entry(class_dev, &usb_device_class->children, node) {
-                if (device->devt == MKDEV(USB_DEVICE_MAJOR, minor)) {
+                if (class_dev->devt == MKDEV(USB_DEVICE_MAJOR, minor)) {
-                        udev = device->platform_data;
+                        dev = class_dev->class_data;
                        break;
                }
        }
        up(&usb_device_class->sem);
-        return udev;
+        return dev;
 };
 /*
@@ -1580,16 +1580,16 @@ static void usbdev_add(struct usb_device *dev)
 {
        int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);
-        dev->usbfs_dev = device_create(usb_device_class, &dev->dev,
+        dev->class_dev = class_device_create(usb_device_class, NULL,
-                                MKDEV(USB_DEVICE_MAJOR, minor),
+                                MKDEV(USB_DEVICE_MAJOR, minor), &dev->dev,
                                "usbdev%d.%d", dev->bus->busnum, dev->devnum);
-        dev->usbfs_dev->platform_data = dev;
+        dev->class_dev->class_data = dev;
 }
 static void usbdev_remove(struct usb_device *dev)
 {
-        device_unregister(dev->usbfs_dev);
+        class_device_unregister(dev->class_dev);
 }
 static int usbdev_notify(struct notifier_block *self, unsigned long action,
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index abee0f5b6a66..8de4f8c99d61 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -194,13 +194,14 @@ int usb_register_dev(struct usb_interface *intf,
                ++temp;
        else
                temp = name;
-        intf->usb_dev = device_create(usb_class->class, &intf->dev,
+        intf->class_dev = class_device_create(usb_class->class, NULL,
-                                      MKDEV(USB_MAJOR, minor), "%s", temp);
+                                              MKDEV(USB_MAJOR, minor),
-        if (IS_ERR(intf->usb_dev)) {
+                                              &intf->dev, "%s", temp);
+        if (IS_ERR(intf->class_dev)) {
                spin_lock (&minor_lock);
                usb_minors[intf->minor] = NULL;
                spin_unlock (&minor_lock);
-                retval = PTR_ERR(intf->usb_dev);
+                retval = PTR_ERR(intf->class_dev);
        }
 exit:
        return retval;
@@ -241,8 +242,8 @@ void usb_deregister_dev(struct usb_interface *intf,
        spin_unlock (&minor_lock);
        snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
-        device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
+        class_device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
-        intf->usb_dev = NULL;
+        intf->class_dev = NULL;
        intf->minor = -1;
        destroy_usb_class();
 }
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 363b2ad74ae6..1a32d96774b4 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -207,7 +207,7 @@ config USB_AT91
 config USB_GADGET_DUMMY_HCD
        boolean "Dummy HCD (DEVELOPMENT)"
-        depends on USB && EXPERIMENTAL
+        depends on (USB=y || (USB=m && USB_GADGET=m)) && EXPERIMENTAL
        select USB_GADGET_DUALSPEED
        help
          This host controller driver emulates USB, looping all data transfer
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 1c459ff037ce..cfebca05ead5 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -57,19 +57,23 @@
 /*
 * This controller is simple and PIO-only.  It's used in many AT91-series
- * ARMv4T controllers, including the at91rm9200 (arm920T, with MMU),
+ * full speed USB controllers, including the at91rm9200 (arm920T, with MMU),
- * at91sam9261 (arm926ejs, with MMU), and several no-mmu versions.
+ * at91sam926x (arm926ejs, with MMU), and several no-mmu versions.
 *
 * This driver expects the board has been wired with two GPIOs suppporting
 * a VBUS sensing IRQ, and a D+ pullup.  (They may be omitted, but the
- * testing hasn't covered such cases.)  The pullup is most important; it
+ * testing hasn't covered such cases.)
+ *
+ * The pullup is most important (so it's integrated on sam926x parts).  It
 * provides software control over whether the host enumerates the device.
+ *
 * The VBUS sensing helps during enumeration, and allows both USB clocks
 * (and the transceiver) to stay gated off until they're necessary, saving
- * power.  During USB suspend, the 48 MHz clock is gated off.
+ * power.  During USB suspend, the 48 MHz clock is gated off in hardware;
+ * it may also be gated off by software during some Linux sleep states.
 */
-#define DRIVER_VERSION  "8 March 2005"
+#define DRIVER_VERSION  "3 May 2006"
 static const char driver_name [] = "at91_udc";
 static const char ep0name[] = "ep0";
@@ -316,9 +320,15 @@ static void done(struct at91_ep *ep, struct at91_request *req, int status)
 *
 * There are also state bits like FORCESTALL, EPEDS, DIR, and EPTYPE
 * that shouldn't normally be changed.
+ *
+ * NOTE at91sam9260 docs mention synch between UDPCK and MCK clock domains,
+ * implying a need to wait for one write to complete (test relevant bits)
+ * before starting the next write.  This shouldn't be an issue given how
+ * infrequently we write, except maybe for write-then-read idioms.
 */
 #define SET_FX  (AT91_UDP_TXPKTRDY)
-#define CLR_FX  (RX_DATA_READY | AT91_UDP_RXSETUP | AT91_UDP_STALLSENT | AT91_UDP_TXCOMP)
+#define CLR_FX  (RX_DATA_READY | AT91_UDP_RXSETUP \
+                | AT91_UDP_STALLSENT | AT91_UDP_TXCOMP)
 /* pull OUT packet data from the endpoint's fifo */
 static int read_fifo (struct at91_ep *ep, struct at91_request *req)
@@ -472,7 +482,8 @@ static void nuke(struct at91_ep *ep, int status)
 /*-------------------------------------------------------------------------*/
-static int at91_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
+static int at91_ep_enable(struct usb_ep *_ep,
+                                const struct usb_endpoint_descriptor *desc)
 {
        struct at91_ep  *ep = container_of(_ep, struct at91_ep, ep);
        struct at91_udc *dev = ep->udc;
@@ -582,11 +593,12 @@ static int at91_ep_disable (struct usb_ep * _ep)
 * interesting for request or buffer allocation.
 */
-static struct usb_request *at91_ep_alloc_request (struct usb_ep *_ep, unsigned int gfp_flags)
+static struct usb_request *
+at91_ep_alloc_request(struct usb_ep *_ep, unsigned int gfp_flags)
 {
        struct at91_request *req;
-        req = kcalloc(1, sizeof (struct at91_request), SLAB_KERNEL);
+        req = kcalloc(1, sizeof (struct at91_request), gfp_flags);
        if (!req)
                return NULL;
@@ -862,6 +874,7 @@ static void stop_activity(struct at91_udc *udc)
        if (udc->gadget.speed == USB_SPEED_UNKNOWN)
                driver = NULL;
        udc->gadget.speed = USB_SPEED_UNKNOWN;
+        udc->suspended = 0;
        for (i = 0; i < NUM_ENDPOINTS; i++) {
                struct at91_ep *ep = &udc->ep[i];
@@ -889,8 +902,8 @@ static void clk_off(struct at91_udc *udc)
                return;
        udc->clocked = 0;
        udc->gadget.speed = USB_SPEED_UNKNOWN;
-        clk_disable(udc->iclk);
        clk_disable(udc->fclk);
+        clk_disable(udc->iclk);
 }
 /*
@@ -911,9 +924,6 @@ static void pullup(struct at91_udc *udc, int is_on)
                at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
                at91_set_gpio_value(udc->board.pullup_pin, 0);
                clk_off(udc);
-                // REVISIT:  with transceiver disabled, will D- float
-                // so that a host would falsely detect a device?
        }
 }
@@ -1290,7 +1300,8 @@ static void handle_ep0(struct at91_udc *udc)
                        if (udc->wait_for_addr_ack) {
                                u32     tmp;
-                                at91_udp_write(AT91_UDP_FADDR, AT91_UDP_FEN | udc->addr);
+                                at91_udp_write(AT91_UDP_FADDR,
+                                                AT91_UDP_FEN | udc->addr);
                                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
                                tmp &= ~AT91_UDP_FADDEN;
                                if (udc->addr)
@@ -1361,9 +1372,10 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc, struct pt_regs *r)
        u32                     rescans = 5;
        while (rescans--) {
-                u32     status = at91_udp_read(AT91_UDP_ISR);
+                u32 status;
-                status &= at91_udp_read(AT91_UDP_IMR);
+                status = at91_udp_read(AT91_UDP_ISR)
+                        & at91_udp_read(AT91_UDP_IMR);
                if (!status)
                        break;
@@ -1379,18 +1391,17 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc, struct pt_regs *r)
                        stop_activity(udc);
                        /* enable ep0 */
-                        at91_udp_write(AT91_UDP_CSR(0), AT91_UDP_EPEDS | AT91_UDP_EPTYPE_CTRL);
+                        at91_udp_write(AT91_UDP_CSR(0),
+                                        AT91_UDP_EPEDS | AT91_UDP_EPTYPE_CTRL);
                        udc->gadget.speed = USB_SPEED_FULL;
                        udc->suspended = 0;
                        at91_udp_write(AT91_UDP_IER, AT91_UDP_EP(0));
                        /*
                         * NOTE:  this driver keeps clocks off unless the
-                         * USB host is present.  That saves power, and also
+                         * USB host is present.  That saves power, but for
-                         * eliminates IRQs (reset, resume, suspend) that can
+                         * boards that don't support VBUS detection, both
-                         * otherwise flood from the controller.  If your
+                         * clocks need to be active most of the time.
-                         * board doesn't support VBUS detection, suspend and
-                         * resume irq logic may need more attention...
                         */
                /* host initiated suspend (3+ms bus idle) */
@@ -1452,13 +1463,19 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc, struct pt_regs *r)
 /*-------------------------------------------------------------------------*/
+static void nop_release(struct device *dev)
+{
+        /* nothing to free */
+}
 static struct at91_udc controller = {
        .gadget = {
-                .ops = &at91_udc_ops,
+                .ops    = &at91_udc_ops,
-                .ep0 = &controller.ep[0].ep,
+                .ep0    = &controller.ep[0].ep,
-                .name = driver_name,
+                .name   = driver_name,
-                .dev = {
+                .dev    = {
-                        .bus_id = "gadget"
+                        .bus_id = "gadget",
+                        .release = nop_release,
                }
        },
        .ep[0] = {
@@ -1468,7 +1485,8 @@ static struct at91_udc controller = {
                },
                .udc            = &controller,
                .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(0)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(0)),
                .int_mask       = 1 << 0,
        },
        .ep[1] = {
@@ -1479,7 +1497,8 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(1)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(1)),
                .int_mask       = 1 << 1,
        },
        .ep[2] = {
@@ -1490,7 +1509,8 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(2)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(2)),
                .int_mask       = 1 << 2,
        },
        .ep[3] = {
@@ -1501,7 +1521,8 @@ static struct at91_udc controller = {
                },
                .udc            = &controller,
                .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(3)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(3)),
                .int_mask       = 1 << 3,
        },
        .ep[4] = {
@@ -1512,7 +1533,8 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(4)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(4)),
                .int_mask       = 1 << 4,
        },
        .ep[5] = {
@@ -1523,10 +1545,11 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP + AT91_UDP_CSR(5)),
+                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
+                                        + AT91_UDP_CSR(5)),
                .int_mask       = 1 << 5,
        },
-        /* ep6 and ep7 are also reserved */
+        /* ep6 and ep7 are also reserved (custom silicon might use them) */
 };
 static irqreturn_t at91_vbus_irq(int irq, void *_udc, struct pt_regs *r)
@@ -1593,6 +1616,7 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
        local_irq_disable();
        udc->enabled = 0;
+        at91_udp_write(AT91_UDP_IDR, ~0);
        pullup(udc, 0);
        local_irq_enable();
@@ -1624,6 +1648,16 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                return -ENODEV;
        }
+        if (pdev->num_resources != 2) {
+                DBG("invalid num_resources");
+                return -ENODEV;
+        }
+        if ((pdev->resource[0].flags != IORESOURCE_MEM)
+                        || (pdev->resource[1].flags != IORESOURCE_IRQ)) {
+                DBG("invalid resource type");
+                return -ENODEV;
+        }
        if (!request_mem_region(AT91_BASE_UDP, SZ_16K, driver_name)) {
                DBG("someone's using UDC memory\n");
                return -EBUSY;
@@ -1649,19 +1683,26 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
        if (retval < 0)
                goto fail0;
-        /* disable everything until there's a gadget driver and vbus */
+        /* don't do anything until we have both gadget driver and VBUS */
-        pullup(udc, 0);
+        clk_enable(udc->iclk);
+        at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+        at91_udp_write(AT91_UDP_IDR, 0xffffffff);
+        clk_disable(udc->iclk);
        /* request UDC and maybe VBUS irqs */
-        if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) {
+        udc->udp_irq = platform_get_irq(pdev, 0);
-                DBG("request irq %d failed\n", AT91_ID_UDP);
+        if (request_irq(udc->udp_irq, at91_udc_irq,
+                        IRQF_DISABLED, driver_name, udc)) {
+                DBG("request irq %d failed\n", udc->udp_irq);
                retval = -EBUSY;
                goto fail1;
        }
        if (udc->board.vbus_pin > 0) {
-                if (request_irq(udc->board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) {
+                if (request_irq(udc->board.vbus_pin, at91_vbus_irq,
-                        DBG("request vbus irq %d failed\n", udc->board.vbus_pin);
+                                IRQF_DISABLED, driver_name, udc)) {
-                        free_irq(AT91_ID_UDP, udc);
+                        DBG("request vbus irq %d failed\n",
+                                        udc->board.vbus_pin);
+                        free_irq(udc->udp_irq, udc);
                        retval = -EBUSY;
                        goto fail1;
                }
@@ -1670,6 +1711,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                udc->vbus = 1;
        }
        dev_set_drvdata(dev, udc);
+        device_init_wakeup(dev, 1);
        create_debug_file(udc);
        INFO("%s version %s\n", driver_name, DRIVER_VERSION);
@@ -1678,14 +1720,14 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
 fail1:
        device_unregister(&udc->gadget.dev);
 fail0:
-        release_mem_region(AT91_VA_BASE_UDP, SZ_16K);
+        release_mem_region(AT91_BASE_UDP, SZ_16K);
        DBG("%s probe failed, %d\n", driver_name, retval);
        return retval;
 }
-static int __devexit at91udc_remove(struct platform_device *dev)
+static int __devexit at91udc_remove(struct platform_device *pdev)
 {
-        struct at91_udc *udc = platform_get_drvdata(dev);
+        struct at91_udc *udc = platform_get_drvdata(pdev);
        DBG("remove\n");
@@ -1694,10 +1736,11 @@ static int __devexit at91udc_remove(struct platform_device *dev)
        if (udc->driver != 0)
                usb_gadget_unregister_driver(udc->driver);
+        device_init_wakeup(&pdev->dev, 0);
        remove_debug_file(udc);
        if (udc->board.vbus_pin > 0)
                free_irq(udc->board.vbus_pin, udc);
-        free_irq(AT91_ID_UDP, udc);
+        free_irq(udc->udp_irq, udc);
        device_unregister(&udc->gadget.dev);
        release_mem_region(AT91_BASE_UDP, SZ_16K);
@@ -1708,31 +1751,36 @@ static int __devexit at91udc_remove(struct platform_device *dev)
 }
 #ifdef CONFIG_PM
-static int at91udc_suspend(struct platform_device *dev, pm_message_t mesg)
+static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
-        struct at91_udc *udc = platform_get_drvdata(dev);
+        struct at91_udc *udc = platform_get_drvdata(pdev);
+        int             wake = udc->driver && device_may_wakeup(&pdev->dev);
-        /*
+        /* Unless we can act normally to the host (letting it wake us up
-         * The "safe" suspend transitions are opportunistic ... e.g. when
+         * whenever it has work for us) force disconnect.  Wakeup requires
-         * the USB link is suspended (48MHz clock autogated off), or when
+         * PLLB for USB events (signaling for reset, wakeup, or incoming
-         * it's disconnected (programmatically gated off, elsewhere).
+         * tokens) and VBUS irqs (on systems which support them).
-         * Then we can suspend, and the chip can enter slow clock mode.
-         *
-         * The problem case is some component (user mode?) suspending this
-         * device while it's active, with the 48 MHz clock in use.  There
-         * are two basic approaches:  (a) veto suspend levels involving slow
-         * clock mode, (b) disconnect, so 48 MHz will no longer be in use
-         * and we can enter slow clock mode.  This uses (b) for now, since
-         * it's simplest until AT91 PM exists and supports the other option.
         */
-        if (udc->vbus && !udc->suspended)
+        if ((!udc->suspended && udc->addr)
+                        || !wake
+                        || at91_suspend_entering_slow_clock()) {
                pullup(udc, 0);
+                disable_irq_wake(udc->udp_irq);
+        } else
+                enable_irq_wake(udc->udp_irq);
+        if (udc->board.vbus_pin > 0) {
+                if (wake)
+                        enable_irq_wake(udc->board.vbus_pin);
+                else
+                        disable_irq_wake(udc->board.vbus_pin);
+        }
        return 0;
 }
-static int at91udc_resume(struct platform_device *dev)
+static int at91udc_resume(struct platform_device *pdev)
 {
-        struct at91_udc *udc = platform_get_drvdata(dev);
+        struct at91_udc *udc = platform_get_drvdata(pdev);
        /* maybe reconnect to host; if so, clocks on */
        pullup(udc, 1);
@@ -1748,7 +1796,7 @@ static struct platform_driver at91_udc = {
        .remove         = __devexit_p(at91udc_remove),
        .shutdown       = at91udc_shutdown,
        .suspend        = at91udc_suspend,
-        .resume         = at91udc_resume,
+        .resume         = at91udc_resume,
        .driver         = {
                .name   = (char *) driver_name,
                .owner  = THIS_MODULE,
@@ -1767,6 +1815,6 @@ static void __devexit udc_exit_module(void)
 }
 module_exit(udc_exit_module);
-MODULE_DESCRIPTION("AT91RM9200 udc driver");
+MODULE_DESCRIPTION("AT91 udc driver");
 MODULE_AUTHOR("Thomas Rathbone, David Brownell");
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 5a4799cedd19..882af42e86cc 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -141,6 +141,7 @@ struct at91_udc {
        struct clk                      *iclk, *fclk;
        struct platform_device          *pdev;
        struct proc_dir_entry           *pde;
+        int                             udp_irq;
 };
 static inline struct at91_udc *to_udc(struct usb_gadget *g)
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 4be47195bd38..7d1c22c34957 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -609,7 +609,8 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req)
        if (!dum->driver)
                return -ESHUTDOWN;
-        spin_lock_irqsave (&dum->lock, flags);
+        local_irq_save (flags);
+        spin_lock (&dum->lock);
        list_for_each_entry (req, &ep->queue, queue) {
                if (&req->req == _req) {
                        list_del_init (&req->queue);
@@ -618,7 +619,7 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req)
                        break;
                }
        }
-        spin_unlock_irqrestore (&dum->lock, flags);
+        spin_unlock (&dum->lock);
        if (retval == 0) {
                dev_dbg (udc_dev(dum),
@@ -626,6 +627,7 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req)
                                req, _ep->name, _req->length, _req->buf);
                _req->complete (_ep, _req);
        }
+        local_irq_restore (flags);
        return retval;
 }
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 85b0b4ad4c16..d63177a8eaea 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -892,7 +892,7 @@ MODULE_LICENSE ("GPL");
 #define PCI_DRIVER              ehci_pci_driver
 #endif
-#ifdef CONFIG_PPC_83xx
+#ifdef CONFIG_MPC834x
 #include "ehci-fsl.c"
 #define PLATFORM_DRIVER         ehci_fsl_driver
 #endif
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index cdbafb710000..85cc059705a6 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -4,7 +4,7 @@
 *  Copyright (C) 2004 SAN People (Pty) Ltd.
 *  Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
 *
- * AT91RM9200 Bus Glue
+ * AT91 Bus Glue
 *
 * Based on fragments of 2.4 driver by Rick Bronson.
 * Based on ohci-omap.c
@@ -19,12 +19,13 @@
 #include <asm/hardware.h>
 #include <asm/arch/board.h>
-#ifndef CONFIG_ARCH_AT91RM9200
+#ifndef CONFIG_ARCH_AT91
-#error "CONFIG_ARCH_AT91RM9200 must be defined."
+#error "CONFIG_ARCH_AT91 must be defined."
 #endif
 /* interface and function clocks */
 static struct clk *iclk, *fclk;
+static int clocked;
 extern int usb_disabled(void);
@@ -35,13 +36,14 @@ static void at91_start_hc(struct platform_device *pdev)
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        struct ohci_regs __iomem *regs = hcd->regs;
-        dev_dbg(&pdev->dev, "starting AT91RM9200 OHCI USB Controller\n");
+        dev_dbg(&pdev->dev, "start\n");
        /*
         * Start the USB clocks.
         */
        clk_enable(iclk);
        clk_enable(fclk);
+        clocked = 1;
        /*
         * The USB host controller must remain in reset.
@@ -54,7 +56,7 @@ static void at91_stop_hc(struct platform_device *pdev)
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        struct ohci_regs __iomem *regs = hcd->regs;
-        dev_dbg(&pdev->dev, "stopping AT91RM9200 OHCI USB Controller\n");
+        dev_dbg(&pdev->dev, "stop\n");
        /*
         * Put the USB host controller into reset.
@@ -66,6 +68,7 @@ static void at91_stop_hc(struct platform_device *pdev)
         */
        clk_disable(fclk);
        clk_disable(iclk);
+        clocked = 0;
 }
@@ -78,14 +81,15 @@ static int usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);
 /**
- * usb_hcd_at91_probe - initialize AT91RM9200-based HCDs
+ * usb_hcd_at91_probe - initialize AT91-based HCDs
 * Context: !in_interrupt()
 *
 * Allocates basic resources for this USB host controller, and
 * then invokes the start() method for the HCD associated with it
 * through the hotplug entry's driver_data.
 */
-int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device *pdev)
+static int usb_hcd_at91_probe(const struct hc_driver *driver,
+                        struct platform_device *pdev)
 {
        int retval;
        struct usb_hcd *hcd = NULL;
@@ -95,12 +99,13 @@ int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device *
                return -ENODEV;
        }
-        if ((pdev->resource[0].flags != IORESOURCE_MEM) || (pdev->resource[1].flags != IORESOURCE_IRQ)) {
+        if ((pdev->resource[0].flags != IORESOURCE_MEM)
+                        || (pdev->resource[1].flags != IORESOURCE_IRQ)) {
                pr_debug("hcd probe: invalid resource type\n");
                return -ENODEV;
        }
-        hcd = usb_create_hcd(driver, &pdev->dev, "at91rm9200");
+        hcd = usb_create_hcd(driver, &pdev->dev, "at91");
        if (!hcd)
                return -ENOMEM;
        hcd->rsrc_start = pdev->resource[0].start;
@@ -149,21 +154,23 @@ int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device *
 /* may be called with controller, bus, and devices active */
 /**
- * usb_hcd_at91_remove - shutdown processing for AT91RM9200-based HCDs
+ * usb_hcd_at91_remove - shutdown processing for AT91-based HCDs
 * @dev: USB Host Controller being removed
 * Context: !in_interrupt()
 *
 * Reverses the effect of usb_hcd_at91_probe(), first invoking
 * the HCD's stop() method.  It is always called from a thread
- * context, normally "rmmod", "apmd", or something similar.
+ * context, "rmmod" or something similar.
 *
 */
-static int usb_hcd_at91_remove (struct usb_hcd *hcd, struct platform_device *pdev)
+static int usb_hcd_at91_remove(struct usb_hcd *hcd,
+                                struct platform_device *pdev)
 {
        usb_remove_hcd(hcd);
        at91_stop_hc(pdev);
        iounmap(hcd->regs);
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        disable_irq_wake(hcd->irq);
        clk_put(fclk);
        clk_put(iclk);
@@ -178,19 +185,21 @@ static int usb_hcd_at91_remove (struct usb_hcd *hcd, struct platform_device *pde
 static int __devinit
 ohci_at91_start (struct usb_hcd *hcd)
 {
-//      struct at91_ohci_data   *board = hcd->self.controller->platform_data;
+        struct at91_usbh_data   *board = hcd->self.controller->platform_data;
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
+        struct usb_device       *root = hcd->self.root_hub;
        int                     ret;
        if ((ret = ohci_init(ohci)) < 0)
                return ret;
+        root->maxchild = board->ports;
        if ((ret = ohci_run(ohci)) < 0) {
                err("can't start %s", hcd->self.bus_name);
                ohci_stop(hcd);
                return ret;
        }
-//      hcd->self.root_hub->maxchild = board->ports;
        return 0;
 }
@@ -198,7 +207,7 @@ ohci_at91_start (struct usb_hcd *hcd)
 static const struct hc_driver ohci_at91_hc_driver = {
        .description =          hcd_name,
-        .product_desc =         "AT91RM9200 OHCI",
+        .product_desc =         "AT91 OHCI",
        .hcd_priv_size =        sizeof(struct ohci_hcd),
        /*
@@ -240,33 +249,54 @@ static const struct hc_driver ohci_at91_hc_driver = {
 /*-------------------------------------------------------------------------*/
-static int ohci_hcd_at91_drv_probe(struct platform_device *dev)
+static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 {
-        return usb_hcd_at91_probe(&ohci_at91_hc_driver, dev);
+        device_init_wakeup(&pdev->dev, 1);
+        return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev);
 }
-static int ohci_hcd_at91_drv_remove(struct platform_device *dev)
+static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
 {
-        return usb_hcd_at91_remove(platform_get_drvdata(dev), dev);
+        device_init_wakeup(&pdev->dev, 0);
+        return usb_hcd_at91_remove(platform_get_drvdata(pdev), pdev);
 }
 #ifdef CONFIG_PM
-/* REVISIT suspend/resume look "too" simple here */
 static int
-ohci_hcd_at91_drv_suspend(struct platform_device *dev, pm_message_t mesg)
+ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
-        clk_disable(fclk);
+        struct usb_hcd  *hcd = platform_get_drvdata(pdev);
-        clk_disable(iclk);
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        if (device_may_wakeup(&pdev->dev))
+                enable_irq_wake(hcd->irq);
+        else
+                disable_irq_wake(hcd->irq);
+        /*
+         * The integrated transceivers seem unable to notice disconnect,
+         * reconnect, or wakeup without the 48 MHz clock active.  so for
+         * correctness, always discard connection state (using reset).
+         *
+         * REVISIT: some boards will be able to turn VBUS off...
+         */
+        if (at91_suspend_entering_slow_clock()) {
+                ohci_usb_reset (ohci);
+                clk_disable(fclk);
+                clk_disable(iclk);
+                clocked = 0;
+        }
        return 0;
 }
-static int ohci_hcd_at91_drv_resume(struct platform_device *dev)
+static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)
 {
-        clk_enable(iclk);
+        if (!clocked) {
-        clk_enable(fclk);
+                clk_enable(iclk);
+                clk_enable(fclk);
+        }
        return 0;
 }
@@ -275,7 +305,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *dev)
 #define ohci_hcd_at91_drv_resume  NULL
 #endif
-MODULE_ALIAS("at91rm9200-ohci");
+MODULE_ALIAS("at91_ohci");
 static struct platform_driver ohci_hcd_at91_driver = {
        .probe          = ohci_hcd_at91_drv_probe,
@@ -283,7 +313,7 @@ static struct platform_driver ohci_hcd_at91_driver = {
        .suspend        = ohci_hcd_at91_drv_suspend,
        .resume         = ohci_hcd_at91_drv_resume,
        .driver         = {
-                .name   = "at91rm9200-ohci",
+                .name   = "at91_ohci",
                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index afef5ac35b4a..94d8cf4b36c1 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -913,7 +913,7 @@ MODULE_LICENSE ("GPL");
 #include "ohci-ppc-soc.c"
 #endif
-#ifdef CONFIG_ARCH_AT91RM9200
+#if defined(CONFIG_ARCH_AT91RM9200) || defined(CONFIG_ARCH_AT91SAM9261)
 #include "ohci-at91.c"
 #endif
@@ -927,6 +927,7 @@ MODULE_LICENSE ("GPL");
      || defined (CONFIG_SOC_AU1X00) \
      || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \
      || defined (CONFIG_ARCH_AT91RM9200) \
+      || defined (CONFIG_ARCH_AT91SAM9261) \
        )
 #error "missing bus glue for ohci-hcd"
 #endif
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index c9d72ac0a1d7..66c3f61bc9d1 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -943,7 +943,9 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)
                        /* We received a short packet */
                        if (urb->transfer_flags & URB_SHORT_NOT_OK)
                                ret = -EREMOTEIO;
-                        else if (ctrlstat & TD_CTRL_SPD)
+                        /* Fixup needed only if this isn't the URB's last TD */
+                        else if (&td->list != urbp->td_list.prev)
                                ret = 1;
                }
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 05d2d6012eb2..df198cf76f52 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -152,9 +152,8 @@ static const char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
 * events. The hardware generates 5 events for the first keypress
 * and we have to take this into account for an accurate repeat
 * behaviour.
- * (HZ / 20) == 50 ms and works well for me.
 */
-#define FILTER_TIME (HZ / 20)
+#define FILTER_TIME 60 /* msec */
 struct ati_remote {
        struct input_dev *idev;
@@ -467,7 +466,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
                /* Filter duplicate events which happen "too close" together. */
                if ((ati_remote->old_data[0] == data[1]) &&
                        (ati_remote->old_data[1] == data[2]) &&
-                        time_before(jiffies, ati_remote->old_jiffies + FILTER_TIME)) {
+                        time_before(jiffies, ati_remote->old_jiffies + msecs_to_jiffies(FILTER_TIME))) {
                        ati_remote->repeat_count++;
                } else {
                        ati_remote->repeat_count = 0;
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c
index e091d327bd9e..a4062a6adbb8 100644
--- a/drivers/usb/misc/cypress_cy7c63.c
+++ b/drivers/usb/misc/cypress_cy7c63.c
@@ -12,8 +12,13 @@
 *       the single I/O ports of the device.
 *
 *       Supported vendors:      AK Modul-Bus Computer GmbH
-*       Supported devices:      CY7C63001A-PC (to be continued...)
+*                               (Firmware "Port-Chip")
-*       Supported functions:    Read/Write Ports (to be continued...)
+*
+*       Supported devices:      CY7C63001A-PC
+*                               CY7C63001C-PXC
+*                               CY7C63001C-SXC
+*
+*       Supported functions:    Read/Write Ports
 *
 *
 *       This program is free software; you can redistribute it and/or
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index e5e6e4f3ef87..bd09232ce13c 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -175,6 +175,8 @@ static inline struct sk_buff *pull_skb(rtl8150_t *);
 static void rtl8150_disconnect(struct usb_interface *intf);
 static int rtl8150_probe(struct usb_interface *intf,
                           const struct usb_device_id *id);
+static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message);
+static int rtl8150_resume(struct usb_interface *intf);
 static const char driver_name [] = "rtl8150";
@@ -183,6 +185,8 @@ static struct usb_driver rtl8150_driver = {
        .probe =        rtl8150_probe,
        .disconnect =   rtl8150_disconnect,
        .id_table =     rtl8150_table,
+        .suspend =      rtl8150_suspend,
+        .resume =       rtl8150_resume
 };
 /*
@@ -238,9 +242,11 @@ static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size)
        usb_fill_control_urb(dev->ctrl_urb, dev->udev,
                         usb_sndctrlpipe(dev->udev, 0), (char *) &dev->dr,
                         &dev->rx_creg, size, ctrl_callback, dev);
-        if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC)))
+        if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) {
+                if (ret == -ENODEV)
+                        netif_device_detach(dev->netdev);
                err("control request submission failed: %d", ret);
-        else
+        } else
                set_bit(RX_REG_SET, &dev->flags);
        return ret;
@@ -416,6 +422,7 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs)
        struct sk_buff *skb;
        struct net_device *netdev;
        u16 rx_stat;
+        int status;
        dev = urb->context;
        if (!dev)
@@ -465,7 +472,10 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs)
 goon:
        usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
                      dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-        if (usb_submit_urb(dev->rx_urb, GFP_ATOMIC)) {
+        status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
+        if (status == -ENODEV)
+                netif_device_detach(dev->netdev);
+        else if (status) {
                set_bit(RX_URB_FAIL, &dev->flags);
                goto resched;
        } else {
@@ -481,6 +491,7 @@ static void rx_fixup(unsigned long data)
 {
        rtl8150_t *dev;
        struct sk_buff *skb;
+        int status;
        dev = (rtl8150_t *)data;
@@ -499,10 +510,13 @@ static void rx_fixup(unsigned long data)
        usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
                      dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
 try_again:
-        if (usb_submit_urb(dev->rx_urb, GFP_ATOMIC)) {
+        status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
+        if (status == -ENODEV) {
+                netif_device_detach(dev->netdev);
+        } else if (status) {
                set_bit(RX_URB_FAIL, &dev->flags);
                goto tlsched;
-         } else {
+        } else {
                clear_bit(RX_URB_FAIL, &dev->flags);
        }
@@ -574,12 +588,43 @@ static void intr_callback(struct urb *urb, struct pt_regs *regs)
 resubmit:
        status = usb_submit_urb (urb, SLAB_ATOMIC);
-        if (status)
+        if (status == -ENODEV)
+                netif_device_detach(dev->netdev);
+        else if (status)
                err ("can't resubmit intr, %s-%s/input0, status %d",
                                dev->udev->bus->bus_name,
                                dev->udev->devpath, status);
 }
+static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        rtl8150_t *dev = usb_get_intfdata(intf);
+        netif_device_detach(dev->netdev);
+        if (netif_running(dev->netdev)) {
+                usb_kill_urb(dev->rx_urb);
+                usb_kill_urb(dev->intr_urb);
+        }
+        return 0;
+}
+static int rtl8150_resume(struct usb_interface *intf)
+{
+        rtl8150_t *dev = usb_get_intfdata(intf);
+        netif_device_attach(dev->netdev);
+        if (netif_running(dev->netdev)) {
+                dev->rx_urb->status = 0;
+                dev->rx_urb->actual_length = 0;
+                read_bulk_callback(dev->rx_urb, NULL);
+                dev->intr_urb->status = 0;
+                dev->intr_urb->actual_length = 0;
+                intr_callback(dev->intr_urb, NULL);
+        }
+        return 0;
+}
 /*
 **
@@ -690,9 +735,14 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        usb_fill_bulk_urb(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev, 2),
                      skb->data, count, write_bulk_callback, dev);
        if ((res = usb_submit_urb(dev->tx_urb, GFP_ATOMIC))) {
-                warn("failed tx_urb %d\n", res);
+                /* Can we get/handle EPIPE here? */
-                dev->stats.tx_errors++;
+                if (res == -ENODEV)
-                netif_start_queue(netdev);
+                        netif_device_detach(dev->netdev);
+                else {
+                        warn("failed tx_urb %d\n", res);
+                        dev->stats.tx_errors++;
+                        netif_start_queue(netdev);
+                }
        } else {
                dev->stats.tx_packets++;
                dev->stats.tx_bytes += skb->len;
@@ -729,16 +779,25 @@ static int rtl8150_open(struct net_device *netdev)
        
        usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
                      dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-        if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL)))
+        if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
+                if (res == -ENODEV)
+                        netif_device_detach(dev->netdev);
                warn("%s: rx_urb submit failed: %d", __FUNCTION__, res);
+                return res;
+        }
        usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
                     dev->intr_buff, INTBUFSIZE, intr_callback,
                     dev, dev->intr_interval);
-        if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL)))
+        if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
+                if (res == -ENODEV)
+                        netif_device_detach(dev->netdev);
                warn("%s: intr_urb submit failed: %d", __FUNCTION__, res);
-        netif_start_queue(netdev);
+                usb_kill_urb(dev->rx_urb);
+                return res;
+        }
        enable_net_traffic(dev);
        set_carrier(netdev);
+        netif_start_queue(netdev);
        return res;
 }
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index ac33bd47cfce..f5b9438c94f0 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,15 +62,6 @@ config USB_SERIAL_AIRPRIME
          To compile this driver as a module, choose M here: the
          module will be called airprime.
-config USB_SERIAL_ANYDATA
-        tristate "USB AnyData CDMA Wireless Driver"
-        depends on USB_SERIAL
-        help
-          Say Y here if you want to use a AnyData CDMA device.
-          To compile this driver as a module, choose M here: the
-          module will be called anydata.
 config USB_SERIAL_ARK3116
        tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
        depends on USB_SERIAL && EXPERIMENTAL
@@ -502,15 +493,18 @@ config USB_SERIAL_XIRCOM
          module will be called keyspan_pda.
 config USB_SERIAL_OPTION
-        tristate "USB driver for GSM modems"
+        tristate "USB driver for GSM and CDMA modems"
        depends on USB_SERIAL
        help
-          Say Y here if you have an "Option" GSM PCMCIA card
+          Say Y here if you have a GSM or CDMA modem that's connected to USB.
-          (or an OEM version: branded Huawei, Audiovox, or Novatel).
+          This driver also supports several PCMCIA cards which have a
+          built-in OHCI-USB adapter and an internally-connected GSM modem.
+          The USB bus on these cards is not accessible externally.
-          These cards feature a built-in OHCI-USB adapter and an
+          Supported devices include (some of?) those made by:
-          internally-connected GSM modem. The USB bus is not
+          Option, Huawei, Audiovox, Sierra Wireless, Novatel Wireless, or
-          accessible externally.
+          Anydata.
          To compile this driver as a module, choose M here: the
          module will be called option.
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 35d4acc7f1d3..8efed2ce1ba3 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -12,7 +12,6 @@ usbserial-obj-$(CONFIG_USB_EZUSB)		+= ezusb.o
 usbserial-objs  := usb-serial.o generic.o bus.o $(usbserial-obj-y)
 obj-$(CONFIG_USB_SERIAL_AIRPRIME)               += airprime.o
-obj-$(CONFIG_USB_SERIAL_ANYDATA)                += anydata.o
 obj-$(CONFIG_USB_SERIAL_ARK3116)                += ark3116.o
 obj-$(CONFIG_USB_SERIAL_BELKIN)                 += belkin_sa.o
 obj-$(CONFIG_USB_SERIAL_CP2101)                 += cp2101.o
diff --git a/drivers/usb/serial/anydata.c b/drivers/usb/serial/anydata.c
deleted file mode 100644
index 01843ef8c11e..000000000000
--- a/drivers/usb/serial/anydata.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * AnyData CDMA Serial USB driver
- *
- * Copyright (C) 2005 Greg Kroah-Hartman <gregkh@suse.de>
- *
- *      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/kernel.h>
-#include <linux/init.h>
-#include <linux/tty.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/usb/serial.h>
-static struct usb_device_id id_table [] = {
-        { USB_DEVICE(0x16d5, 0x6501) }, /* AirData CDMA device */
-        { },
-};
-MODULE_DEVICE_TABLE(usb, id_table);
-/* if overridden by the user, then use their value for the size of the
- * read and write urbs */
-static int buffer_size;
-static int debug;
-static struct usb_driver anydata_driver = {
-        .name =         "anydata",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table,
-        .no_dynamic_id =        1,
-};
-static int anydata_open(struct usb_serial_port *port, struct file *filp)
-{
-        char *buffer;
-        int result = 0;
-        dbg("%s - port %d", __FUNCTION__, port->number);
-        if (buffer_size) {
-                /* override the default buffer sizes */
-                buffer = kmalloc(buffer_size, GFP_KERNEL);
-                if (!buffer) {
-                        dev_err(&port->dev, "%s - out of memory.\n",
-                                __FUNCTION__);
-                        return -ENOMEM;
-                }
-                kfree (port->read_urb->transfer_buffer);
-                port->read_urb->transfer_buffer = buffer;
-                port->read_urb->transfer_buffer_length = buffer_size;
-                buffer = kmalloc(buffer_size, GFP_KERNEL);
-                if (!buffer) {
-                        dev_err(&port->dev, "%s - out of memory.\n",
-                                __FUNCTION__);
-                        return -ENOMEM;
-                }
-                kfree (port->write_urb->transfer_buffer);
-                port->write_urb->transfer_buffer = buffer;
-                port->write_urb->transfer_buffer_length = buffer_size;
-                port->bulk_out_size = buffer_size;
-        }
-        /* Start reading from the device */
-        usb_fill_bulk_urb(port->read_urb, port->serial->dev,
-                          usb_rcvbulkpipe(port->serial->dev,
-                                          port->bulk_in_endpointAddress),
-                          port->read_urb->transfer_buffer,
-                          port->read_urb->transfer_buffer_length,
-                          usb_serial_generic_read_bulk_callback, port);
-        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
-        if (result)
-                dev_err(&port->dev,
-                        "%s - failed submitting read urb, error %d\n",
-                        __FUNCTION__, result);
-        return result;
-}
-static struct usb_serial_driver anydata_device = {
-        .driver = {
-                .owner =        THIS_MODULE,
-                .name =         "anydata",
-        },
-        .id_table =             id_table,
-        .num_interrupt_in =     NUM_DONT_CARE,
-        .num_bulk_in =          NUM_DONT_CARE,
-        .num_bulk_out =         NUM_DONT_CARE,
-        .num_ports =            1,
-        .open =                 anydata_open,
-};
-static int __init anydata_init(void)
-{
-        int retval;
-        retval = usb_serial_register(&anydata_device);
-        if (retval)
-                return retval;
-        retval = usb_register(&anydata_driver);
-        if (retval)
-                usb_serial_deregister(&anydata_device);
-        return retval;
-}
-static void __exit anydata_exit(void)
-{
-        usb_deregister(&anydata_driver);
-        usb_serial_deregister(&anydata_device);
-}
-module_init(anydata_init);
-module_exit(anydata_exit);
-MODULE_LICENSE("GPL");
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debug enabled or not");
-module_param(buffer_size, int, 0);
-MODULE_PARM_DESC(buffer_size, "Size of the transfer buffers");
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index b458aedc5fb6..a20da8528a5f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -337,6 +337,7 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(FTDI_VID, FTDI_MTXORB_6_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_PERLE_ULTRAPORT_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_PIEGROUP_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_TNC_X_PID) },
        { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2101_PID) },
        { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2102_PID) },
        { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2103_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 04ef90fcb876..9f7343a45424 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -182,6 +182,10 @@
 /* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */
 #define FTDI_USB_UIRT_PID       0xF850  /* Product Id */
+/* TNC-X USB-to-packet-radio adapter, versions prior to 3.0 (DLP module) */
+#define FTDI_TNC_X_PID          0xEBE0
 /*
 * ELV USB devices submitted by Christian Abt of ELV (www.elv.de).
 * All of these devices use FTDI's vendor ID (0x0403).
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 59c5d999009a..7e1bd5d6dfa0 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -250,6 +250,7 @@ static struct usb_device_id ipaq_id_table [] = {
        { USB_DEVICE(0x04C5, 0x1058) }, /* FUJITSU USB Sync */
        { USB_DEVICE(0x04C5, 0x1079) }, /* FUJITSU USB Sync */
        { USB_DEVICE(0x04DA, 0x2500) }, /* Panasonic USB Sync */
+        { USB_DEVICE(0x04DD, 0x9102) }, /* SHARP WS003SH USB Modem */
        { USB_DEVICE(0x04E8, 0x5F00) }, /* Samsung NEXiO USB Sync */
        { USB_DEVICE(0x04E8, 0x5F01) }, /* Samsung NEXiO USB Sync */
        { USB_DEVICE(0x04E8, 0x5F02) }, /* Samsung NEXiO USB Sync */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index f0530c1d7b7a..c856e6f40e22 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -9,40 +9,14 @@
  Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
-  History:
+  History: see the git log.
-  2005-05-19  v0.1   Initial version, based on incomplete docs
-                     and analysis of misbehavior with the standard driver
-  2005-05-20  v0.2   Extended the input buffer to avoid losing
-                     random 64-byte chunks of data
-  2005-05-21  v0.3   implemented chars_in_buffer()
-                     turned on low_latency
-                     simplified the code somewhat
-  2005-05-24  v0.4   option_write() sometimes deadlocked under heavy load
-                     removed some dead code
-                     added sponsor notice
-                     coding style clean-up
-  2005-06-20  v0.4.1 add missing braces :-/
-                     killed end-of-line whitespace
-  2005-07-15  v0.4.2 rename WLAN product to FUSION, add FUSION2
-  2005-09-10  v0.4.3 added HUAWEI E600 card and Audiovox AirCard
-  2005-09-20  v0.4.4 increased recv buffer size: the card sometimes
-                     wants to send >2000 bytes.
-  2006-04-10  v0.5   fixed two array overrun errors :-/
-  2006-04-21  v0.5.1 added support for Sierra Wireless MC8755
-  2006-05-15  v0.6   re-enable multi-port support
-  2006-06-01  v0.6.1 add COBRA
-  2006-06-01  v0.6.2 add backwards-compatibility stuff
-  2006-06-01  v0.6.3 add Novatel Wireless
-  2006-06-01  v0.7   Option => GSM
-  2006-06-01  v0.7.1 add COBRA2
  Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
  This driver exists because the "normal" serial driver doesn't work too well
  with GSM modems. Issues:
  - data loss -- one single Receive URB is not nearly enough
-  - nonstandard flow (Option devices) and multiplex (Sierra) control
+  - nonstandard flow (Option devices) control
  - controlling the baud rate doesn't make sense
  This driver is named "option" because the most common device it's
@@ -96,8 +70,8 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_VENDOR_ID                0x0AF0
 #define HUAWEI_VENDOR_ID                0x12D1
 #define AUDIOVOX_VENDOR_ID              0x0F3D
-#define SIERRAWIRELESS_VENDOR_ID        0x1199
 #define NOVATELWIRELESS_VENDOR_ID       0x1410
+#define ANYDATA_VENDOR_ID               0x16d5
 #define OPTION_PRODUCT_OLD              0x5000
 #define OPTION_PRODUCT_FUSION           0x6000
@@ -106,8 +80,8 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_PRODUCT_COBRA2           0x6600
 #define HUAWEI_PRODUCT_E600             0x1001
 #define AUDIOVOX_PRODUCT_AIRCARD        0x0112
-#define SIERRAWIRELESS_PRODUCT_MC8755   0x6802
 #define NOVATELWIRELESS_PRODUCT_U740    0x1400
+#define ANYDATA_PRODUCT_ID              0x6501
 static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
@@ -117,8 +91,8 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
-        { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
+        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
        { } /* Terminating entry */
 };
@@ -131,10 +105,7 @@ static struct usb_device_id option_ids1[] = {
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
-        { } /* Terminating entry */
+        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
-};
-static struct usb_device_id option_ids3[] = {
-        { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },
        { } /* Terminating entry */
 };
@@ -151,37 +122,11 @@ static struct usb_driver option_driver = {
 /* The card has three separate interfaces, which the serial driver
 * recognizes separately, thus num_port=1.
 */
-static struct usb_serial_driver option_3port_device = {
-        .driver = {
-                .owner =        THIS_MODULE,
-                .name =         "option",
-        },
-        .description       = "GSM modem (3-port)",
-        .id_table          = option_ids3,
-        .num_interrupt_in  = NUM_DONT_CARE,
-        .num_bulk_in       = NUM_DONT_CARE,
-        .num_bulk_out      = NUM_DONT_CARE,
-        .num_ports         = 3,
-        .open              = option_open,
-        .close             = option_close,
-        .write             = option_write,
-        .write_room        = option_write_room,
-        .chars_in_buffer   = option_chars_in_buffer,
-        .throttle          = option_rx_throttle,
-        .unthrottle        = option_rx_unthrottle,
-        .set_termios       = option_set_termios,
-        .break_ctl         = option_break_ctl,
-        .tiocmget          = option_tiocmget,
-        .tiocmset          = option_tiocmset,
-        .attach            = option_startup,
-        .shutdown          = option_shutdown,
-        .read_int_callback = option_instat_callback,
-};
 static struct usb_serial_driver option_1port_device = {
        .driver = {
                .owner =        THIS_MODULE,
-                .name =         "option",
+                .name =         "option1",
        },
        .description       = "GSM modem (1-port)",
        .id_table          = option_ids1,
@@ -245,9 +190,6 @@ static int __init option_init(void)
        retval = usb_serial_register(&option_1port_device);
        if (retval)
                goto failed_1port_device_register;
-        retval = usb_serial_register(&option_3port_device);
-        if (retval)
-                goto failed_3port_device_register;
        retval = usb_register(&option_driver);
        if (retval)
                goto failed_driver_register;
@@ -257,8 +199,6 @@ static int __init option_init(void)
        return 0;
 failed_driver_register:
-        usb_serial_deregister (&option_3port_device);
-failed_3port_device_register:
        usb_serial_deregister (&option_1port_device);
 failed_1port_device_register:
        return retval;
@@ -267,7 +207,6 @@ failed_1port_device_register:
 static void __exit option_exit(void)
 {
        usb_deregister (&option_driver);
-        usb_serial_deregister (&option_3port_device);
        usb_serial_deregister (&option_1port_device);
 }
@@ -656,7 +595,6 @@ static void option_setup_urbs(struct usb_serial *serial)
        dbg("%s", __FUNCTION__);
        for (i = 0; i < serial->num_ports; i++) {
                port = serial->port[i];
                portdata = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 259db31b65c1..efbbc0adb89a 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -81,6 +81,7 @@ static struct usb_device_id id_table [] = {
        { USB_DEVICE(SPEEDDRAGON_VENDOR_ID, SPEEDDRAGON_PRODUCT_ID) },
        { USB_DEVICE(OTI_VENDOR_ID, OTI_PRODUCT_ID) },
        { USB_DEVICE(DATAPILOT_U2_VENDOR_ID, DATAPILOT_U2_PRODUCT_ID) },
+        { USB_DEVICE(BELKIN_VENDOR_ID, BELKIN_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index d9c1e6e0b4b3..a692ac66ca6c 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -89,3 +89,7 @@
 /* DATAPILOT Universal-2 Phone Cable */
 #define DATAPILOT_U2_VENDOR_ID  0x0731
 #define DATAPILOT_U2_PRODUCT_ID 0x2003
+/* Belkin "F5U257" Serial Adapter */
+#define BELKIN_VENDOR_ID        0x050d
+#define BELKIN_PRODUCT_ID       0x0257
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a5ca449f6e64..2793f9a912b4 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -145,6 +145,13 @@ UNUSUAL_DEV(  0x0420, 0x0001, 0x0100, 0x0100,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_IGNORE_RESIDUE ),
+/* Reported by Mario Rettig <mariorettig@web.de> */
+UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
+                "Nokia",
+                "Nokia 3250",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
 /* Reported by Sumedha Swamy <sumedhaswamy@gmail.com> and
 * Einar Th. Einarsson <einarthered@gmail.com> */
 UNUSUAL_DEV(  0x0421, 0x0444, 0x0100, 0x0100,
@@ -627,18 +634,6 @@ UNUSUAL_DEV(  0x0595, 0x4343, 0x0000, 0x2210,
                "Digital Camera EX-20 DSC",
                US_SC_8070, US_PR_DEVICE, NULL, 0 ),
-/* The entry was here before I took over, and had US_SC_RBC. It turns
- * out that isn't needed. Additionally, Torsten Eriksson
- * <Torsten.Eriksson@bergianska.se> is able to use his device fine
- * without this entry at all - but I don't suspect that will be true
- * for all users (the protocol is likely needed), so is staying at
- * this time. - Phil Dibowitz <phil@ipom.com>
- */
-UNUSUAL_DEV(  0x059f, 0xa601, 0x0200, 0x0200, 
-                "LaCie",
-                "USB Hard Disk",
-                US_SC_DEVICE, US_PR_CB, NULL, 0 ),
 /* Submitted by Joel Bourquard <numlock@freesurf.ch>
 * Some versions of this device need the SubClass and Protocol overrides
 * while others don't.
@@ -1106,7 +1101,15 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,
                "Optio S/S4",
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_FIX_INQUIRY ),
-                
+/* This is a virtual windows driver CD, which the zd1211rw driver automatically
+ * converts into a WLAN device. */
+UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,
+                "ZyXEL",
+                "G-220F USB-WLAN Install",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_DEVICE ),
 #ifdef CONFIG_USB_STORAGE_ISD200
 UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
                "ATI",
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 5ee19be52f65..8d7bdcb5924d 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -483,7 +483,7 @@ static struct us_unusual_dev *find_unusual(const struct usb_device_id *id)
 }
 /* Get the unusual_devs entries and the string descriptors */
-static void get_device_info(struct us_data *us, const struct usb_device_id *id)
+static int get_device_info(struct us_data *us, const struct usb_device_id *id)
 {
        struct usb_device *dev = us->pusb_dev;
        struct usb_interface_descriptor *idesc =
@@ -500,6 +500,11 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)
                        unusual_dev->useTransport;
        us->flags = USB_US_ORIG_FLAGS(id->driver_info);
+        if (us->flags & US_FL_IGNORE_DEVICE) {
+                printk(KERN_INFO USB_STORAGE "device ignored\n");
+                return -ENODEV;
+        }
        /*
         * This flag is only needed when we're in high-speed, so let's
         * disable it if we're in full-speed
@@ -541,6 +546,8 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)
                                msgs[msg],
                                UTS_RELEASE);
        }
+        return 0;
 }
 /* Get the transport settings */
@@ -969,7 +976,9 @@ static int storage_probe(struct usb_interface *intf,
         * of the match from the usb_device_id table, so we can find the
         * corresponding entry in the private table.
         */
-        get_device_info(us, id);
+        result = get_device_info(us, id);
+        if (result)
+                goto BadDevice;
        /* Get the transport, protocol, and pipe settings */
        result = get_transport(us);
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 6533b0f39231..c40b9b8b1e7e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -86,9 +86,11 @@ config FB_MACMODES
       default n
 config FB_BACKLIGHT
-       bool
+        bool
-       depends on FB
+        depends on FB
-       default n
+        select BACKLIGHT_LCD_SUPPORT
+        select BACKLIGHT_CLASS_DEVICE
+        default n
 config FB_MODE_HELPERS
        bool "Enable Video Mode Handling Helpers"
@@ -420,7 +422,7 @@ config FB_OF
 config FB_CONTROL
        bool "Apple \"control\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -431,7 +433,7 @@ config FB_CONTROL
 config FB_PLATINUM
        bool "Apple \"platinum\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -442,7 +444,7 @@ config FB_PLATINUM
 config FB_VALKYRIE
        bool "Apple \"valkyrie\" display support"
-        depends on (FB = y) && (MAC || PPC_PMAC)
+        depends on (FB = y) && (MAC || (PPC_PMAC && PPC32))
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -453,7 +455,7 @@ config FB_VALKYRIE
 config FB_CT65550
        bool "Chips 65550 display support"
-        depends on (FB = y) && PPC
+        depends on (FB = y) && PPC32
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -721,10 +723,8 @@ config FB_NVIDIA_I2C
 config FB_NVIDIA_BACKLIGHT
        bool "Support for backlight control"
-        depends on FB_NVIDIA && PPC_PMAC
+        depends on FB_NVIDIA && PMAC_BACKLIGHT
        select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -769,10 +769,8 @@ config FB_RIVA_DEBUG
 config FB_RIVA_BACKLIGHT
        bool "Support for backlight control"
-        depends on FB_RIVA && PPC_PMAC
+        depends on FB_RIVA && PMAC_BACKLIGHT
        select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -1025,10 +1023,8 @@ config FB_RADEON_I2C
 config FB_RADEON_BACKLIGHT
        bool "Support for backlight control"
-        depends on FB_RADEON && PPC_PMAC
+        depends on FB_RADEON && PMAC_BACKLIGHT
        select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -1059,10 +1055,8 @@ config FB_ATY128
 config FB_ATY128_BACKLIGHT
        bool "Support for backlight control"
-        depends on FB_ATY128 && PPC_PMAC
+        depends on FB_ATY128 && PMAC_BACKLIGHT
        select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -1111,10 +1105,8 @@ config FB_ATY_GX
 config FB_ATY_BACKLIGHT
        bool "Support for backlight control"
-        depends on FB_ATY && PPC_PMAC
+        depends on FB_ATY && PMAC_BACKLIGHT
        select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -1620,7 +1612,7 @@ if FB || SGI_NEWPORT_CONSOLE
        source "drivers/video/logo/Kconfig"
 endif
-if FB && SYSFS
+if SYSFS
        source "drivers/video/backlight/Kconfig"
 endif
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 95563c9c6b9c..481c6c9695f8 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -4,6 +4,7 @@
 # Each configuration option enables a list of files.
+obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                     modedb.o fbcvt.o
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index c64a717e2d4b..8b08121b390b 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -455,7 +455,10 @@ static void do_wait_for_fifo(u16 entries, struct aty128fb_par *par);
 static void wait_for_fifo(u16 entries, struct aty128fb_par *par);
 static void wait_for_idle(struct aty128fb_par *par);
 static u32 depth_to_dst(u32 depth);
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
 static void aty128_bl_set_power(struct fb_info *info, int power);
+#endif
 #define BIOS_IN8(v)     (readb(bios + (v)))
 #define BIOS_IN16(v)    (readb(bios + (v)) | \
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 1507d19f481f..053ff63365b7 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2812,7 +2812,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
        if (par->lock_blank || par->asleep)
                return 0;
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
        if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
                aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
@@ -2844,7 +2844,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
        }
        aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
                aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 8d85fc58142e..8e3400d5dd21 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -266,6 +266,8 @@ static int force_measure_pll = 0;
 #ifdef CONFIG_MTRR
 static int nomtrr = 0;
 #endif
+static int force_sleep;
+static int ignore_devlist;
 /*
 * prototypes
@@ -2327,9 +2329,9 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                /* -2 is special: means  ON on mobility chips and do not
                 * change on others
                 */
-                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1);
+                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1, ignore_devlist, force_sleep);
        } else
-                radeonfb_pm_init(rinfo, default_dynclk);
+                radeonfb_pm_init(rinfo, default_dynclk, ignore_devlist, force_sleep);
        pci_set_drvdata(pdev, info);
@@ -2477,6 +2479,12 @@ static int __init radeonfb_setup (char *options)
                        force_measure_pll = 1;
                } else if (!strncmp(this_opt, "ignore_edid", 11)) {
                        ignore_edid = 1;
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+                } else if (!strncmp(this_opt, "force_sleep", 11)) {
+                        force_sleep = 1;
+                } else if (!strncmp(this_opt, "ignore_devlist", 14)) {
+                        ignore_devlist = 1;
+#endif
                } else
                        mode_option = this_opt;
        }
@@ -2532,3 +2540,9 @@ module_param(panel_yres, int, 0);
 MODULE_PARM_DESC(panel_yres, "int: set panel yres");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+module_param(force_sleep, bool, 0);
+MODULE_PARM_DESC(force_sleep, "bool: force D2 sleep mode on all hardware");
+module_param(ignore_devlist, bool, 0);
+MODULE_PARM_DESC(ignore_devlist, "bool: ignore workarounds for bugs in specific laptops");
+#endif
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index c7091761cef4..f31e606a2ded 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -27,6 +27,99 @@
 #include "ati_ids.h"
+static void radeon_reinitialize_M10(struct radeonfb_info *rinfo);
+/*
+ * Workarounds for bugs in PC laptops:
+ * - enable D2 sleep in some IBM Thinkpads
+ * - special case for Samsung P35
+ *
+ * Whitelist by subsystem vendor/device because
+ * its the subsystem vendor's fault!
+ */
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+struct radeon_device_id {
+        const char *ident;                     /* (arbitrary) Name */
+        const unsigned short subsystem_vendor; /* Subsystem Vendor ID */
+        const unsigned short subsystem_device; /* Subsystem Device ID */
+        const enum radeon_pm_mode pm_mode_modifier; /* modify pm_mode */
+        const reinit_function_ptr new_reinit_func;   /* changed reinit_func */
+};
+#define BUGFIX(model, sv, sd, pm, fn) { \
+        .ident = model, \
+        .subsystem_vendor = sv, \
+        .subsystem_device = sd, \
+        .pm_mode_modifier = pm, \
+        .new_reinit_func  = fn  \
+}
+static struct radeon_device_id radeon_workaround_list[] = {
+        BUGFIX("IBM Thinkpad R32",
+               PCI_VENDOR_ID_IBM, 0x1905,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0526,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0527,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R50/R51/T40/T41",
+               PCI_VENDOR_ID_IBM, 0x0531,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R51/T40/T41/T42",
+               PCI_VENDOR_ID_IBM, 0x0530,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T30",
+               PCI_VENDOR_ID_IBM, 0x0517,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T40p",
+               PCI_VENDOR_ID_IBM, 0x054d,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T42",
+               PCI_VENDOR_ID_IBM, 0x0550,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad X31/X32",
+               PCI_VENDOR_ID_IBM, 0x052f,
+               radeon_pm_d2, NULL),
+        BUGFIX("Samsung P35",
+               PCI_VENDOR_ID_SAMSUNG, 0xc00c,
+               radeon_pm_off, radeon_reinitialize_M10),
+        { .ident = NULL }
+};
+static int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        struct radeon_device_id *id;
+        for (id = radeon_workaround_list; id->ident != NULL; id++ )
+                if ((id->subsystem_vendor == rinfo->pdev->subsystem_vendor ) &&
+                    (id->subsystem_device == rinfo->pdev->subsystem_device )) {
+                        /* we found a device that requires workaround */
+                        printk(KERN_DEBUG "radeonfb: %s detected"
+                               ", enabling workaround\n", id->ident);
+                        rinfo->pm_mode |= id->pm_mode_modifier;
+                        if (id->new_reinit_func != NULL)
+                                rinfo->reinit_func = id->new_reinit_func;
+                        return 1;
+                }
+        return 0;  /* not found */
+}
+#else  /* defined(CONFIG_PM) && defined(CONFIG_X86) */
+static inline int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        return 0;
+}
+#endif /* defined(CONFIG_PM) && defined(CONFIG_X86) */
 static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
 {
        u32 tmp;
@@ -852,18 +945,26 @@ static void radeon_pm_setup_for_suspend(struct radeonfb_info *rinfo)
        /* because both INPLL and OUTPLL take the same lock, that's why. */
        tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
        OUTPLL( pllMCLK_MISC, tmp);
-        
-        /* AGP PLL control */
-        if (rinfo->family <= CHIP_FAMILY_RV280) {
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
-                OUTREG(BUS_CNTL1,
+        /* BUS_CNTL1__MOBILE_PLATORM_SEL setting is northbridge chipset
-                       (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
+         * and radeon chip dependent. Thus we only enable it on Mac for
-                       | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
+         * now (until we get more info on how to compute the correct
-        } else {
+         * value for various X86 bridges).
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
+         */
-                OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+#ifdef CONFIG_PPC_PMAC
+        if (machine_is(powermac)) {
+                /* AGP PLL control */
+                if (rinfo->family <= CHIP_FAMILY_RV280) {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
+                        OUTREG(BUS_CNTL1,
+                               (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
+                               | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
+                } else {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
+                        OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+                }
        }
+#endif
        OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
                                  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
@@ -2713,7 +2814,7 @@ static void radeonfb_early_resume(void *data)
 #endif /* CONFIG_PM */
-void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
+void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep)
 {
        /* Find PM registers in config space if any*/
        rinfo->pm_reg = pci_find_capability(rinfo->pdev, PCI_CAP_ID_PM);
@@ -2729,22 +2830,13 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
        }
 #if defined(CONFIG_PM)
+#if defined(CONFIG_PPC_PMAC)
        /* Check if we can power manage on suspend/resume. We can do
         * D2 on M6, M7 and M9, and we can resume from D3 cold a few other
         * "Mac" cards, but that's all. We need more infos about what the
         * BIOS does tho. Right now, all this PM stuff is pmac-only for that
         * reason. --BenH
         */
-        /* Special case for Samsung P35 laptops
-         */
-        if ((rinfo->pdev->vendor == PCI_VENDOR_ID_ATI) &&
-            (rinfo->pdev->device == PCI_CHIP_RV350_NP) &&
-            (rinfo->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG) &&
-            (rinfo->pdev->subsystem_device == 0xc00c)) {
-                rinfo->reinit_func = radeon_reinitialize_M10;
-                rinfo->pm_mode |= radeon_pm_off;
-        }
-#if defined(CONFIG_PPC_PMAC)
        if (machine_is(powermac) && rinfo->of_node) {
                if (rinfo->is_mobility && rinfo->pm_reg &&
                    rinfo->family <= CHIP_FAMILY_RV250)
@@ -2790,6 +2882,18 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
        }
 #endif /* defined(CONFIG_PPC_PMAC) */
 #endif /* defined(CONFIG_PM) */
+        if (ignore_devlist)
+                printk(KERN_DEBUG
+                       "radeonfb: skipping test for device workarounds\n");
+        else
+                radeon_apply_workarounds(rinfo);
+        if (force_sleep) {
+                printk(KERN_DEBUG
+                       "radeonfb: forcefully enabling D2 sleep mode\n");
+                rinfo->pm_mode |= radeon_pm_d2;
+        }
 }
 void radeonfb_pm_exit(struct radeonfb_info *rinfo)
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 38657b2d10eb..d5ff224a6258 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -273,6 +273,8 @@ enum radeon_pm_mode {
        radeon_pm_off   = 0x00000002,   /* Can resume from D3 cold */
 };
+typedef void (*reinit_function_ptr)(struct radeonfb_info *rinfo);
 struct radeonfb_info {
        struct fb_info          *info;
@@ -338,7 +340,7 @@ struct radeonfb_info {
        int                     dynclk;
        int                     no_schedule;
        enum radeon_pm_mode     pm_mode;
-        void                    (*reinit_func)(struct radeonfb_info *rinfo);
+        reinit_function_ptr     reinit_func;
        /* Lock on register access */
        spinlock_t              reg_lock;
@@ -600,7 +602,7 @@ extern int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8
 /* PM Functions */
 extern int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state);
 extern int radeonfb_pci_resume(struct pci_dev *pdev);
-extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk);
+extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep);
 extern void radeonfb_pm_exit(struct radeonfb_info *rinfo);
 /* Monitor probe functions */
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 022f9d3473f5..02f15297a021 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -10,7 +10,7 @@ menuconfig BACKLIGHT_LCD_SUPPORT
 config BACKLIGHT_CLASS_DEVICE
        tristate "Lowlevel Backlight controls"
-        depends on BACKLIGHT_LCD_SUPPORT && FB
+        depends on BACKLIGHT_LCD_SUPPORT
        default m
        help
          This framework adds support for low-level control of the LCD
@@ -26,7 +26,7 @@ config BACKLIGHT_DEVICE
 config LCD_CLASS_DEVICE
        tristate "Lowlevel LCD controls"
-        depends on BACKLIGHT_LCD_SUPPORT && FB
+        depends on BACKLIGHT_LCD_SUPPORT
        default m
        help
          This framework adds support for low-level control of LCD.
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 52ed12b12acc..eb4d03fa5391 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -197,7 +197,7 @@ static int __init mdacon_setup(char *str)
 __setup("mdacon=", mdacon_setup);
 #endif
-static int __init mda_detect(void)
+static int mda_detect(void)
 {
        int count=0;
        u16 *p, p_save;
@@ -282,7 +282,7 @@ static int __init mda_detect(void)
        return 1;
 }
-static void __init mda_initialize(void)
+static void mda_initialize(void)
 {
        write_mda_b(97, 0x00);          /* horizontal total */
        write_mda_b(80, 0x01);          /* horizontal displayed */
diff --git a/drivers/video/fb_notify.c b/drivers/video/fb_notify.c
new file mode 100644
index 000000000000..8c020389e4fa
--- /dev/null
+++ b/drivers/video/fb_notify.c
@@ -0,0 +1,46 @@
+/*
+ *  linux/drivers/video/fb_notify.c
+ *
+ *  Copyright (C) 2006 Antonino Daplas <adaplas@pol.net>
+ *
+ *      2001 - Documented with DocBook
+ *      - Brad Douglas <brad@neruo.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/fb.h>
+#include <linux/notifier.h>
+static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
+/**
+ *      fb_register_client - register a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_register_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_register_client);
+/**
+ *      fb_unregister_client - unregister a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_unregister_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_unregister_client);
+/**
+ * fb_notifier_call_chain - notify clients of fb_events
+ *
+ */
+int fb_notifier_call_chain(unsigned long val, void *v)
+{
+        return blocking_notifier_call_chain(&fb_notifier_list, val, v);
+}
+EXPORT_SYMBOL_GPL(fb_notifier_call_chain);
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 4fc9df426c1a..17961e3ecaa0 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -52,7 +52,6 @@
 #define FBPIXMAPSIZE    (1024 * 8)
-static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
@@ -791,8 +790,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                    event.info = info;
                    event.data = &mode1;
-                    ret = blocking_notifier_call_chain(&fb_notifier_list,
+                    ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);
-                                              FB_EVENT_MODE_DELETE, &event);
                }
                if (!ret)
@@ -837,8 +835,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                                info->flags &= ~FBINFO_MISC_USEREVENT;
                                event.info = info;
-                                blocking_notifier_call_chain(&fb_notifier_list,
+                                fb_notifier_call_chain(evnt, &event);
-                                                evnt, &event);
                        }
                }
        }
@@ -861,8 +858,7 @@ fb_blank(struct fb_info *info, int blank)
                event.info = info;
                event.data = &blank;
-                blocking_notifier_call_chain(&fb_notifier_list,
+                fb_notifier_call_chain(FB_EVENT_BLANK, &event);
-                                FB_EVENT_BLANK, &event);
        }
        return ret;
@@ -933,8 +929,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                con2fb.framebuffer = -1;
                event.info = info;
                event.data = &con2fb;
-                blocking_notifier_call_chain(&fb_notifier_list,
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
-                                    FB_EVENT_GET_CONSOLE_MAP, &event);
                return copy_to_user(argp, &con2fb,
                                    sizeof(con2fb)) ? -EFAULT : 0;
        case FBIOPUT_CON2FBMAP:
@@ -952,9 +947,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                    return -EINVAL;
                event.info = info;
                event.data = &con2fb;
-                return blocking_notifier_call_chain(&fb_notifier_list,
+                return fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
-                                           FB_EVENT_SET_CONSOLE_MAP,
+                                              &event);
-                                           &event);
        case FBIOBLANK:
                acquire_console_sem();
                info->flags |= FBINFO_MISC_USEREVENT;
@@ -1330,8 +1324,7 @@ register_framebuffer(struct fb_info *fb_info)
        registered_fb[i] = fb_info;
        event.info = fb_info;
-        blocking_notifier_call_chain(&fb_notifier_list,
+        fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
-                            FB_EVENT_FB_REGISTERED, &event);
        return 0;
 }
@@ -1365,30 +1358,11 @@ unregister_framebuffer(struct fb_info *fb_info)
        fb_cleanup_class_device(fb_info);
        class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
        event.info = fb_info;
-        blocking_notifier_call_chain(&fb_notifier_list,
+        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
-                                     FB_EVENT_FB_UNREGISTERED, &event);
        return 0;
 }
 /**
- *      fb_register_client - register a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_register_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_register(&fb_notifier_list, nb);
-}
-/**
- *      fb_unregister_client - unregister a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_unregister_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
-}
-/**
 *      fb_set_suspend - low level driver signals suspend
 *      @info: framebuffer affected
 *      @state: 0 = resuming, !=0 = suspending
@@ -1403,13 +1377,11 @@ void fb_set_suspend(struct fb_info *info, int state)
        event.info = info;
        if (state) {
-                blocking_notifier_call_chain(&fb_notifier_list,
+                fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
-                                FB_EVENT_SUSPEND, &event);
                info->state = FBINFO_STATE_SUSPENDED;
        } else {
                info->state = FBINFO_STATE_RUNNING;
-                blocking_notifier_call_chain(&fb_notifier_list,
+                fb_notifier_call_chain(FB_EVENT_RESUME, &event);
-                                FB_EVENT_RESUME, &event);
        }
 }
@@ -1480,9 +1452,7 @@ int fb_new_modelist(struct fb_info *info)
        if (!list_empty(&info->modelist)) {
                event.info = info;
-                err = blocking_notifier_call_chain(&fb_notifier_list,
+                err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
-                                           FB_EVENT_NEW_MODELIST,
-                                           &event);
        }
        return err;
@@ -1594,8 +1564,6 @@ EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
 EXPORT_SYMBOL(fb_set_suspend);
-EXPORT_SYMBOL(fb_register_client);
-EXPORT_SYMBOL(fb_unregister_client);
 EXPORT_SYMBOL(fb_get_options);
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 9f2066f0745a..d4f850117874 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -34,10 +34,6 @@
 #include "nv_proto.h"
 #include "nv_dma.h"
-#ifndef CONFIG_PCI              /* sanity check */
-#error This driver requires PCI support.
-#endif
 #undef CONFIG_FB_NVIDIA_DEBUG
 #ifdef CONFIG_FB_NVIDIA_DEBUG
 #define NVTRACE          printk
@@ -1303,20 +1299,19 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
        nvidia_save_vga(par, &par->SavedReg);
+        pci_set_drvdata(pd, info);
+        nvidia_bl_init(par);
        if (register_framebuffer(info) < 0) {
                printk(KERN_ERR PFX "error registering nVidia framebuffer\n");
                goto err_out_iounmap_fb;
        }
-        pci_set_drvdata(pd, info);
        printk(KERN_INFO PFX
               "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
               info->fix.id,
               par->FbMapSize / (1024 * 1024), info->fix.smem_start);
-        nvidia_bl_init(par);
        NVTRACE_LEAVE();
        return 0;
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index ce5f3031b99b..0013311e0564 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -62,8 +62,6 @@ struct offb_par default_par;
     *  Interface used by the world
     */
-int offb_init(void);
 static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                          u_int transp, struct fb_info *info);
 static int offb_blank(int blank, struct fb_info *info);
@@ -72,11 +70,6 @@ static int offb_blank(int blank, struct fb_info *info);
 extern boot_infos_t *boot_infos;
 #endif
-static void offb_init_nodriver(struct device_node *);
-static void offb_init_fb(const char *name, const char *full_name,
-                         int width, int height, int depth, int pitch,
-                         unsigned long address, struct device_node *dp);
 static struct fb_ops offb_ops = {
        .owner          = THIS_MODULE,
        .fb_setcolreg   = offb_setcolreg,
@@ -229,123 +222,17 @@ static int offb_blank(int blank, struct fb_info *info)
        return 0;
 }
-    /*
-     *  Initialisation
-     */
-int __init offb_init(void)
+static void __iomem *offb_map_reg(struct device_node *np, int index,
+                                  unsigned long offset, unsigned long size)
 {
-        struct device_node *dp = NULL, *boot_disp = NULL;
+        struct resource r;
-        if (fb_get_options("offb", NULL))
-                return -ENODEV;
-        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+        if (of_address_to_resource(np, index, &r))
-                if (get_property(dp, "linux,opened", NULL) &&
+                return 0;
-                    get_property(dp, "linux,boot-display", NULL)) {
+        if ((r.start + offset + size) > r.end)
-                        boot_disp = dp;
+                return 0;
-                        offb_init_nodriver(dp);
+        return ioremap(r.start + offset, size);
-                }
-        }
-        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (get_property(dp, "linux,opened", NULL) &&
-                    dp != boot_disp)
-                        offb_init_nodriver(dp);
-        }
-        return 0;
-}
-static void __init offb_init_nodriver(struct device_node *dp)
-{
-        unsigned int len;
-        int i, width = 640, height = 480, depth = 8, pitch = 640;
-        unsigned int flags, rsize, addr_prop = 0;
-        unsigned long max_size = 0;
-        u64 rstart, address = OF_BAD_ADDR;
-        u32 *pp, *addrp, *up;
-        u64 asize;
-        pp = (u32 *)get_property(dp, "linux,bootx-depth", &len);
-        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "depth", &len);
-        if (pp && len == sizeof(u32))
-                depth = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-width", &len);
-        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "width", &len);
-        if (pp && len == sizeof(u32))
-                width = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-height", &len);
-        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "height", &len);
-        if (pp && len == sizeof(u32))
-                height = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &len);
-        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "linebytes", &len);
-        if (pp && len == sizeof(u32))
-                pitch = *pp;
-        else
-                pitch = width * ((depth + 7) / 8);
-        rsize = (unsigned long)pitch * (unsigned long)height;
-        /* Ok, now we try to figure out the address of the framebuffer.
-         *
-         * Unfortunately, Open Firmware doesn't provide a standard way to do
-         * so. All we can do is a dodgy heuristic that happens to work in
-         * practice. On most machines, the "address" property contains what
-         * we need, though not on Matrox cards found in IBM machines. What I've
-         * found that appears to give good results is to go through the PCI
-         * ranges and pick one that is both big enough and if possible encloses
-         * the "address" property. If none match, we pick the biggest
-         */
-        up = (u32 *)get_property(dp, "linux,bootx-addr", &len);
-        if (up == NULL)
-                up = (u32 *)get_property(dp, "address", &len);
-        if (up && len == sizeof(u32))
-                addr_prop = *up;
-        for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
-                     != NULL; i++) {
-                int match_addrp = 0;
-                if (!(flags & IORESOURCE_MEM))
-                        continue;
-                if (asize < rsize)
-                        continue;
-                rstart = of_translate_address(dp, addrp);
-                if (rstart == OF_BAD_ADDR)
-                        continue;
-                if (addr_prop && (rstart <= addr_prop) &&
-                    ((rstart + asize) >= (addr_prop + rsize)))
-                        match_addrp = 1;
-                if (match_addrp) {
-                        address = addr_prop;
-                        break;
-                }
-                if (rsize > max_size) {
-                        max_size = rsize;
-                        address = OF_BAD_ADDR;
-                }
-                if (address == OF_BAD_ADDR)
-                        address = rstart;
-        }
-        if (address == OF_BAD_ADDR && addr_prop)
-                address = (u64)addr_prop;
-        if (address != OF_BAD_ADDR) {
-                /* kludge for valkyrie */
-                if (strcmp(dp->name, "valkyrie") == 0)
-                        address += 0x1000;
-                offb_init_fb(dp->name, dp->full_name, width, height, depth,
-                             pitch, address, dp);
-        }
 }
 static void __init offb_init_fb(const char *name, const char *full_name,
@@ -402,45 +289,39 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        par->cmap_type = cmap_unknown;
        if (depth == 8) {
                /* Palette hacks disabled for now */
-#if 0
                if (dp && !strncmp(name, "ATY,Rage128", 11)) {
-                        unsigned long regbase = dp->addrs[2].address;
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
+                        if (par->cmap_adr)
-                        par->cmap_type = cmap_r128;
+                                par->cmap_type = cmap_r128;
                } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
                                  || !strncmp(name, "ATY,RageM3p12A", 14))) {
-                        unsigned long regbase =
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                            dp->parent->addrs[2].address;
+                        if (par->cmap_adr)
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
+                                par->cmap_type = cmap_M3A;
-                        par->cmap_type = cmap_M3A;
                } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
-                        unsigned long regbase =
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                            dp->parent->addrs[2].address;
+                        if (par->cmap_adr)
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
+                                par->cmap_type = cmap_M3B;
-                        par->cmap_type = cmap_M3B;
                } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
-                        unsigned long regbase = dp->addrs[1].address;
+                        par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
+                        if (par->cmap_adr)
-                        par->cmap_type = cmap_radeon;
+                                par->cmap_type = cmap_radeon;
                } else if (!strncmp(name, "ATY,", 4)) {
                        unsigned long base = address & 0xff000000UL;
                        par->cmap_adr =
                            ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
                        par->cmap_data = par->cmap_adr + 1;
                        par->cmap_type = cmap_m64;
-                } else if (device_is_compatible(dp, "pci1014,b7")) {
+                } else if (dp && device_is_compatible(dp, "pci1014,b7")) {
-                        unsigned long regbase = dp->addrs[0].address;
+                        par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
-                        par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
+                        if (par->cmap_adr)
-                        par->cmap_type = cmap_gxt2000;
+                                par->cmap_type = cmap_gxt2000;
                }
-#endif
+                fix->visual = (par->cmap_type != cmap_unknown) ?
-                fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
+                        FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
-                    : FB_VISUAL_STATIC_PSEUDOCOLOR;
        } else
-                fix->visual =   /* par->cmap_adr ? FB_VISUAL_DIRECTCOLOR
+                fix->visual = FB_VISUAL_TRUECOLOR;
-                                   : */ FB_VISUAL_TRUECOLOR;
        var->xoffset = var->yoffset = 0;
        switch (depth) {
@@ -520,5 +401,139 @@ static void __init offb_init_fb(const char *name, const char *full_name,
               info->node, full_name);
 }
+static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
+{
+        unsigned int len;
+        int i, width = 640, height = 480, depth = 8, pitch = 640;
+        unsigned int flags, rsize, addr_prop = 0;
+        unsigned long max_size = 0;
+        u64 rstart, address = OF_BAD_ADDR;
+        u32 *pp, *addrp, *up;
+        u64 asize;
+        pp = (u32 *)get_property(dp, "linux,bootx-depth", &len);
+        if (pp == NULL)
+                pp = (u32 *)get_property(dp, "depth", &len);
+        if (pp && len == sizeof(u32))
+                depth = *pp;
+        pp = (u32 *)get_property(dp, "linux,bootx-width", &len);
+        if (pp == NULL)
+                pp = (u32 *)get_property(dp, "width", &len);
+        if (pp && len == sizeof(u32))
+                width = *pp;
+        pp = (u32 *)get_property(dp, "linux,bootx-height", &len);
+        if (pp == NULL)
+                pp = (u32 *)get_property(dp, "height", &len);
+        if (pp && len == sizeof(u32))
+                height = *pp;
+        pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &len);
+        if (pp == NULL)
+                pp = (u32 *)get_property(dp, "linebytes", &len);
+        if (pp && len == sizeof(u32))
+                pitch = *pp;
+        else
+                pitch = width * ((depth + 7) / 8);
+        rsize = (unsigned long)pitch * (unsigned long)height;
+        /* Ok, now we try to figure out the address of the framebuffer.
+         *
+         * Unfortunately, Open Firmware doesn't provide a standard way to do
+         * so. All we can do is a dodgy heuristic that happens to work in
+         * practice. On most machines, the "address" property contains what
+         * we need, though not on Matrox cards found in IBM machines. What I've
+         * found that appears to give good results is to go through the PCI
+         * ranges and pick one that is both big enough and if possible encloses
+         * the "address" property. If none match, we pick the biggest
+         */
+        up = (u32 *)get_property(dp, "linux,bootx-addr", &len);
+        if (up == NULL)
+                up = (u32 *)get_property(dp, "address", &len);
+        if (up && len == sizeof(u32))
+                addr_prop = *up;
+        /* Hack for when BootX is passing us */
+        if (no_real_node)
+                goto skip_addr;
+        for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+                     != NULL; i++) {
+                int match_addrp = 0;
+                if (!(flags & IORESOURCE_MEM))
+                        continue;
+                if (asize < rsize)
+                        continue;
+                rstart = of_translate_address(dp, addrp);
+                if (rstart == OF_BAD_ADDR)
+                        continue;
+                if (addr_prop && (rstart <= addr_prop) &&
+                    ((rstart + asize) >= (addr_prop + rsize)))
+                        match_addrp = 1;
+                if (match_addrp) {
+                        address = addr_prop;
+                        break;
+                }
+                if (rsize > max_size) {
+                        max_size = rsize;
+                        address = OF_BAD_ADDR;
+                }
+                if (address == OF_BAD_ADDR)
+                        address = rstart;
+        }
+ skip_addr:
+        if (address == OF_BAD_ADDR && addr_prop)
+                address = (u64)addr_prop;
+        if (address != OF_BAD_ADDR) {
+                /* kludge for valkyrie */
+                if (strcmp(dp->name, "valkyrie") == 0)
+                        address += 0x1000;
+                offb_init_fb(no_real_node ? "bootx" : dp->name,
+                             no_real_node ? "display" : dp->full_name,
+                             width, height, depth, pitch, address,
+                             no_real_node ? dp : NULL);
+        }
+}
+static int __init offb_init(void)
+{
+        struct device_node *dp = NULL, *boot_disp = NULL;
+        if (fb_get_options("offb", NULL))
+                return -ENODEV;
+        /* Check if we have a MacOS display without a node spec */
+        if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
+                /* The old code tried to work out which node was the MacOS
+                 * display based on the address. I'm dropping that since the
+                 * lack of a node spec only happens with old BootX versions
+                 * (users can update) and with this code, they'll still get
+                 * a display (just not the palette hacks).
+                 */
+                offb_init_nodriver(of_chosen, 1);
+        }
+        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+                if (get_property(dp, "linux,opened", NULL) &&
+                    get_property(dp, "linux,boot-display", NULL)) {
+                        boot_disp = dp;
+                        offb_init_nodriver(dp, 0);
+                }
+        }
+        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+                if (get_property(dp, "linux,opened", NULL) &&
+                    dp != boot_disp)
+                        offb_init_nodriver(dp, 0);
+        }
+        return 0;
+}
 module_init(offb_init);
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 33dddbae5420..76fc9d355eb7 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -2132,6 +2132,9 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
        fb_destroy_modedb(info->monspecs.modedb);
        info->monspecs.modedb = NULL;
+        pci_set_drvdata(pd, info);
+        riva_bl_init(info->par);
        ret = register_framebuffer(info);
        if (ret < 0) {
                printk(KERN_ERR PFX
@@ -2139,8 +2142,6 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                goto err_iounmap_screen_base;
        }
-        pci_set_drvdata(pd, info);
        printk(KERN_INFO PFX
                "PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n",
                info->fix.id,
@@ -2148,8 +2149,6 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                info->fix.smem_len / (1024 * 1024),
                info->fix.smem_start);
-        riva_bl_init(info->par);
        NVTRACE_LEAVE();
        return 0;
author	Jeff Garzik <jeff@garzik.org>	2006-08-03 17:35:48 -0400
committer	Jeff Garzik <jeff@garzik.org>	2006-08-03 17:35:48 -0400
commit	36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch)
tree	c5b52547b2658a8a3b898b8224b835a7e8396017 /drivers
parent	95916edd02e3a7752315422f386c55723d4a3637 (diff)
parent	f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff)