* the userland interface
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/sysdev.h>
#include <linux/poll.h>
-#include <linux/mutex.h>
#include <asm/byteorder.h>
#include <asm/io.h>
struct of_device *of_dev;
int doorbell; /* doorbell gpio */
u32 __iomem *db_buf; /* doorbell buffer */
- struct device_node *db_node;
- unsigned int db_irq;
+ int db_irq;
int msg;
- struct device_node *msg_node;
- unsigned int msg_irq;
+ int msg_irq;
struct smu_cmd_buf *cmd_buf; /* command buffer virtual */
u32 cmd_buf_abs; /* command buffer absolute */
struct list_head cmd_list;
* for now, just hard code that
*/
static struct smu_device *smu;
-static DEFINE_MUTEX(smu_part_access);
-static int smu_irq_inited;
+static DECLARE_MUTEX(smu_part_access);
static void smu_i2c_retry(unsigned long data);
smu_start_cmd();
spin_unlock_irqrestore(&smu->lock, flags);
- /* Workaround for early calls when irq isn't available */
- if (!smu_irq_inited || smu->db_irq == NO_IRQ)
- smu_spinwait_cmd(cmd);
-
return 0;
}
EXPORT_SYMBOL(smu_queue_cmd);
smu->cmd_buf_abs = (u32)smu_cmdbuf_abs;
smu->cmd_buf = (struct smu_cmd_buf *)abs_to_virt(smu_cmdbuf_abs);
- smu->db_node = of_find_node_by_name(NULL, "smu-doorbell");
- if (smu->db_node == NULL) {
+ np = of_find_node_by_name(NULL, "smu-doorbell");
+ if (np == NULL) {
printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
goto fail;
}
- data = (u32 *)get_property(smu->db_node, "reg", NULL);
+ data = (u32 *)get_property(np, "reg", NULL);
if (data == NULL) {
- of_node_put(smu->db_node);
- smu->db_node = NULL;
+ of_node_put(np);
printk(KERN_ERR "SMU: Can't find doorbell GPIO address !\n");
goto fail;
}
smu->doorbell = *data;
if (smu->doorbell < 0x50)
smu->doorbell += 0x50;
+ if (np->n_intrs > 0)
+ smu->db_irq = np->intrs[0].line;
+
+ of_node_put(np);
/* Now look for the smu-interrupt GPIO */
do {
- smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
- if (smu->msg_node == NULL)
+ np = of_find_node_by_name(NULL, "smu-interrupt");
+ if (np == NULL)
break;
- data = (u32 *)get_property(smu->msg_node, "reg", NULL);
+ data = (u32 *)get_property(np, "reg", NULL);
if (data == NULL) {
- of_node_put(smu->msg_node);
- smu->msg_node = NULL;
+ of_node_put(np);
break;
}
smu->msg = *data;
if (smu->msg < 0x50)
smu->msg += 0x50;
+ if (np->n_intrs > 0)
+ smu->msg_irq = np->intrs[0].line;
+ of_node_put(np);
} while(0);
/* Doorbell buffer is currently hard-coded, I didn't find a proper
smu->i2c_timer.function = smu_i2c_retry;
smu->i2c_timer.data = (unsigned long)smu;
- if (smu->db_node) {
- smu->db_irq = irq_of_parse_and_map(smu->db_node, 0);
- if (smu->db_irq == NO_IRQ)
- printk(KERN_ERR "smu: failed to map irq for node %s\n",
- smu->db_node->full_name);
- }
- if (smu->msg_node) {
- smu->msg_irq = irq_of_parse_and_map(smu->msg_node, 0);
- if (smu->msg_irq == NO_IRQ)
- printk(KERN_ERR "smu: failed to map irq for node %s\n",
- smu->msg_node->full_name);
- }
-
/*
* Try to request the interrupts
*/
if (smu->db_irq != NO_IRQ) {
if (request_irq(smu->db_irq, smu_db_intr,
- IRQF_SHARED, "SMU doorbell", smu) < 0) {
+ SA_SHIRQ, "SMU doorbell", smu) < 0) {
printk(KERN_WARNING "SMU: can't "
"request interrupt %d\n",
smu->db_irq);
if (smu->msg_irq != NO_IRQ) {
if (request_irq(smu->msg_irq, smu_msg_intr,
- IRQF_SHARED, "SMU message", smu) < 0) {
+ SA_SHIRQ, "SMU message", smu) < 0) {
printk(KERN_WARNING "SMU: can't "
"request interrupt %d\n",
smu->msg_irq);
}
}
- smu_irq_inited = 1;
return 0;
}
/* This has to be before arch_initcall as the low i2c stuff relies on the
static int __init smu_init_sysfs(void)
{
+ int rc;
+
/*
* Due to sysfs bogosity, a sysdev is not a real device, so
* we should in fact create both if we want sysdev semantics
* I'm a bit too far from figuring out how that works with those
* new chipsets, but that will come back and bite us
*/
- of_register_driver(&smu_of_platform_driver);
+ rc = of_register_driver(&smu_of_platform_driver);
return 0;
}
if (fail && --cmd->retries > 0) {
DPRINTK("SMU: i2c failure, starting timer...\n");
BUG_ON(cmd != smu->cmd_i2c_cur);
- if (!smu_irq_inited) {
- mdelay(5);
- smu_i2c_retry(0);
- return;
- }
mod_timer(&smu->i2c_timer, jiffies + msecs_to_jiffies(5));
return;
}
static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
{
- DECLARE_COMPLETION_ONSTACK(comp);
+ DECLARE_COMPLETION(comp);
unsigned int chunk;
struct smu_cmd cmd;
int rc;
static struct smu_sdbp_header *smu_create_sdb_partition(int id)
{
- DECLARE_COMPLETION_ONSTACK(comp);
+ DECLARE_COMPLETION(comp);
struct smu_simple_cmd cmd;
unsigned int addr, len, tlen;
struct smu_sdbp_header *hdr;
if (interruptible) {
int rc;
- rc = mutex_lock_interruptible(&smu_part_access);
+ rc = down_interruptible(&smu_part_access);
if (rc)
return ERR_PTR(rc);
} else
- mutex_lock(&smu_part_access);
+ down(&smu_part_access);
part = (struct smu_sdbp_header *)get_property(smu->of_node,
pname, size);
if (part != NULL && size)
*size = part->len << 2;
}
- mutex_unlock(&smu_part_access);
+ up(&smu_part_access);
return part;
}
git://git.onelab.eu / linux-2.6.git / blobdiff