summaryrefslogtreecommitdiff
path: root/drivers/hwmon/mag3110.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon/mag3110.c')
-rwxr-xr-xdrivers/hwmon/mag3110.c123
1 files changed, 66 insertions, 57 deletions
diff --git a/drivers/hwmon/mag3110.c b/drivers/hwmon/mag3110.c
index 55f2114869cd..f17212553355 100755
--- a/drivers/hwmon/mag3110.c
+++ b/drivers/hwmon/mag3110.c
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
+ * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,11 +40,12 @@
#define MAG3110_AC_OFFSET 0
#define MAG3110_DR_MODE_MASK (0x7 << 5)
#define MAG3110_DR_MODE_OFFSET 5
-#define MAG3110_IRQ_USED 0
+#define MAG3110_IRQ_USED 1
-#define POLL_INTERVAL_MAX 500
-#define POLL_INTERVAL 100
-#define INT_TIMEOUT 1000
+#define POLL_INTERVAL_MIN 100
+#define POLL_INTERVAL_MAX 1000
+#define POLL_INTERVAL 500
+#define INT_TIMEOUT 1000
/* register enum for mag3110 registers */
enum {
MAG3110_DR_STATUS = 0x00,
@@ -83,15 +84,16 @@ struct mag3110_data {
int position;
};
static short MAGHAL[8][3][3] = {
- { {0, 1, 0}, {-1, 0, 0}, {0, 0, 1} },
- { {1, 0, 0}, {0, 1, 0}, {0, 0, 1} },
- { {0, -1, 0}, {1, 0, 0}, {0, 0, 1} },
- { {-1, 0, 0}, {0, -1, 0}, {0, 0, 1} },
-
- { {0, 1, 0}, {1, 0, 0}, {0, 0, -1} },
- { {1, 0, 0}, {0, -1, 0}, {0, 0, -1} },
- { {0, -1, 0}, {-1, 0, 0}, {0, 0, -1} },
- { {-1, 0, 0}, {0, 1, 0}, {0, 0, -1} },
+ {{ 0, 1, 0}, {-1, 0, 0}, {0, 0, 1} },
+ {{ 1, 0, 0}, { 0, 1, 0}, {0, 0, 1} },
+ {{ 0, -1, 0}, { 1, 0, 0}, {0, 0, 1} },
+ {{-1, 0, 0}, { 0, -1, 0}, {0, 0, 1} },
+
+ {{ 0, 1, 0}, { 1, 0, 0}, {0, 0, -1} },
+ {{ 1, 0, 0}, { 0, -1, 0}, {0, 0, -1} },
+ {{ 0, -1, 0}, {-1, 0, 0}, {0, 0, -1} },
+ {{-1, 0, 0}, { 0, 1, 0}, {0, 0, -1} },
+
};
static struct mag3110_data *mag3110_pdata;
@@ -106,9 +108,11 @@ static int mag3110_adjust_position(short *x, short *y, short *z)
int position = mag3110_pdata->position;
if (position < 0 || position > 7)
position = 0;
+
rawdata[0] = *x;
rawdata[1] = *y;
rawdata[2] = *z;
+
for (i = 0; i < 3; i++) {
data[i] = 0;
for (j = 0; j < 3; j++)
@@ -142,9 +146,10 @@ static int mag3110_write_reg(struct i2c_client *client, u8 reg, char value)
* This function do multiple mag3110 registers read.
*/
static int mag3110_read_block_data(struct i2c_client *client, u8 reg,
- int count, u8 *addr)
+ int count, u8 *addr)
{
- if (i2c_smbus_read_i2c_block_data(client, reg, count, addr) < count) {
+ if (i2c_smbus_read_i2c_block_data
+ (client, reg, count, addr) < count) {
dev_err(&client->dev, "i2c block read failed\n");
return -1;
}
@@ -172,24 +177,27 @@ static int mag3110_init_client(struct i2c_client *client)
}
/***************************************************************
-*
-* read sensor data from mag3110
-*
-***************************************************************/
+ *
+ * read sensor data from mag3110
+ *
+ ***************************************************************/
static int mag3110_read_data(short *x, short *y, short *z)
{
struct mag3110_data *data;
- int retry = 3;
u8 tmp_data[MAG3110_XYZ_DATA_LEN];
+#if !MAG3110_IRQ_USED
+ int retry = 3;
int result;
+#endif
+
if (!mag3110_pdata || mag3110_pdata->active == MAG_STANDBY)
return -EINVAL;
data = mag3110_pdata;
#if MAG3110_IRQ_USED
if (!wait_event_interruptible_timeout
- (data->waitq, data->data_ready != 0,
- msecs_to_jiffies(INT_TIMEOUT))) {
+ (data->waitq, data->data_ready != 0,
+ msecs_to_jiffies(INT_TIMEOUT))) {
dev_dbg(&data->client->dev, "interrupt not received\n");
return -ETIME;
}
@@ -197,11 +205,12 @@ static int mag3110_read_data(short *x, short *y, short *z)
do {
msleep(1);
result = i2c_smbus_read_byte_data(data->client,
- MAG3110_DR_STATUS);
+ MAG3110_DR_STATUS);
retry--;
} while (!(result & MAG3110_STATUS_ZYXDR) && retry > 0);
/* Clear data_ready flag after data is read out */
if (retry == 0) {
+ printk(KERN_DEBUG "magd wait data ready timeout....\n");
return -EINVAL;
}
#endif
@@ -209,8 +218,7 @@ static int mag3110_read_data(short *x, short *y, short *z)
data->data_ready = 0;
if (mag3110_read_block_data(data->client,
- MAG3110_OUT_X_MSB, MAG3110_XYZ_DATA_LEN,
- tmp_data) < 0)
+ MAG3110_OUT_X_MSB, MAG3110_XYZ_DATA_LEN, tmp_data) < 0)
return -1;
*x = ((tmp_data[0] << 8) & 0xff00) | tmp_data[1];
@@ -253,7 +261,7 @@ static irqreturn_t mag3110_irq_handler(int irq, void *dev_id)
}
#endif
static ssize_t mag3110_enable_show(struct device *dev,
- struct device_attribute *attr, char *buf)
+ struct device_attribute *attr, char *buf)
{
struct i2c_client *client;
int val;
@@ -266,8 +274,8 @@ static ssize_t mag3110_enable_show(struct device *dev,
}
static ssize_t mag3110_enable_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct i2c_client *client;
int reg, ret, enable;
@@ -277,7 +285,7 @@ static ssize_t mag3110_enable_store(struct device *dev,
mutex_lock(&mag3110_lock);
client = mag3110_pdata->client;
reg = mag3110_read_reg(client, MAG3110_CTRL_REG1);
- if (enable && mag3110_pdata->active == MAG_STANDBY) {
+ if (enable && mag3110_pdata->active == MAG_STANDBY) {
reg |= MAG3110_AC_MASK;
ret = mag3110_write_reg(client, MAG3110_CTRL_REG1, reg);
if (!ret)
@@ -293,33 +301,33 @@ static ssize_t mag3110_enable_store(struct device *dev,
msleep(100);
/* Read out MSB data to clear interrupt flag automatically */
mag3110_read_block_data(client, MAG3110_OUT_X_MSB,
- MAG3110_XYZ_DATA_LEN, tmp_data);
+ MAG3110_XYZ_DATA_LEN, tmp_data);
}
mutex_unlock(&mag3110_lock);
return count;
}
static DEVICE_ATTR(enable, S_IWUSR | S_IRUGO,
- mag3110_enable_show, mag3110_enable_store);
+ mag3110_enable_show, mag3110_enable_store);
static ssize_t mag3110_dr_mode_show(struct device *dev,
- struct device_attribute *attr, char *buf)
+ struct device_attribute *attr, char *buf)
{
struct i2c_client *client;
int val;
client = mag3110_pdata->client;
val = (mag3110_read_reg(client, MAG3110_CTRL_REG1)
- & MAG3110_DR_MODE_MASK) >> MAG3110_DR_MODE_OFFSET;
+ & MAG3110_DR_MODE_MASK) >> MAG3110_DR_MODE_OFFSET;
return sprintf(buf, "%d\n", val);
}
static ssize_t mag3110_dr_mode_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
- struct i2c_client *client;
+ struct i2c_client *client ;
int reg, ret;
unsigned long val;
@@ -329,7 +337,7 @@ static ssize_t mag3110_dr_mode_store(struct device *dev,
client = mag3110_pdata->client;
reg = mag3110_read_reg(client, MAG3110_CTRL_REG1) &
- ~MAG3110_DR_MODE_MASK;
+ ~MAG3110_DR_MODE_MASK;
reg |= (val << MAG3110_DR_MODE_OFFSET);
/* MAG3110_CTRL_REG1 bit 5-7: data rate mode */
ret = mag3110_write_reg(client, MAG3110_CTRL_REG1, reg);
@@ -340,10 +348,10 @@ static ssize_t mag3110_dr_mode_store(struct device *dev,
}
static DEVICE_ATTR(dr_mode, S_IWUSR | S_IRUGO,
- mag3110_dr_mode_show, mag3110_dr_mode_store);
+ mag3110_dr_mode_show, mag3110_dr_mode_store);
static ssize_t mag3110_position_show(struct device *dev,
- struct device_attribute *attr, char *buf)
+ struct device_attribute *attr, char *buf)
{
int val;
mutex_lock(&mag3110_lock);
@@ -353,8 +361,8 @@ static ssize_t mag3110_position_show(struct device *dev,
}
static ssize_t mag3110_position_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
int position;
position = simple_strtoul(buf, NULL, 10);
@@ -365,7 +373,7 @@ static ssize_t mag3110_position_store(struct device *dev,
}
static DEVICE_ATTR(position, S_IWUSR | S_IRUGO,
- mag3110_position_show, mag3110_position_store);
+ mag3110_position_show, mag3110_position_store);
static struct attribute *mag3110_attributes[] = {
&dev_attr_enable.attr,
@@ -379,7 +387,7 @@ static const struct attribute_group mag3110_attr_group = {
};
static int __devinit mag3110_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+ const struct i2c_device_id *id)
{
struct i2c_adapter *adapter;
struct input_dev *idev;
@@ -388,9 +396,9 @@ static int __devinit mag3110_probe(struct i2c_client *client,
adapter = to_i2c_adapter(client->dev.parent);
if (!i2c_check_functionality(adapter,
- I2C_FUNC_SMBUS_BYTE |
- I2C_FUNC_SMBUS_BYTE_DATA |
- I2C_FUNC_SMBUS_I2C_BLOCK))
+ I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SMBUS_BYTE_DATA |
+ I2C_FUNC_SMBUS_I2C_BLOCK))
return -EIO;
dev_info(&client->dev, "check mag3110 chip ID\n");
@@ -398,8 +406,8 @@ static int __devinit mag3110_probe(struct i2c_client *client,
if (MAG3110_ID != ret) {
dev_err(&client->dev,
- "read chip ID 0x%x is not equal to 0x%x!\n", ret,
- MAG3110_ID);
+ "read chip ID 0x%x is not equal to 0x%x!\n",
+ ret, MAG3110_ID);
return -EINVAL;
}
data = kzalloc(sizeof(struct mag3110_data), GFP_KERNEL);
@@ -426,6 +434,7 @@ static int __devinit mag3110_probe(struct i2c_client *client,
}
data->poll_dev->poll = mag3110_dev_poll;
data->poll_dev->poll_interval = POLL_INTERVAL;
+ data->poll_dev->poll_interval_min = POLL_INTERVAL_MIN;
data->poll_dev->poll_interval_max = POLL_INTERVAL_MAX;
idev = data->poll_dev->input;
idev->name = MAG3110_DRV_NAME;
@@ -450,10 +459,10 @@ static int __devinit mag3110_probe(struct i2c_client *client,
/* set irq type to edge rising */
#if MAG3110_IRQ_USED
ret = request_irq(client->irq, mag3110_irq_handler,
- IRQF_TRIGGER_RISING, client->dev.driver->name, idev);
+ IRQF_TRIGGER_RISING, client->dev.driver->name, idev);
if (ret < 0) {
dev_err(&client->dev, "failed to register irq %d!\n",
- client->irq);
+ client->irq);
goto error_rm_dev_sysfs;
}
#endif
@@ -488,7 +497,7 @@ static int __devexit mag3110_remove(struct i2c_client *client)
data->ctl_reg1 = mag3110_read_reg(client, MAG3110_CTRL_REG1);
ret = mag3110_write_reg(client, MAG3110_CTRL_REG1,
- data->ctl_reg1 & ~MAG3110_AC_MASK);
+ data->ctl_reg1 & ~MAG3110_AC_MASK);
free_irq(client->irq, data);
input_unregister_polled_device(data->poll_dev);
@@ -509,7 +518,7 @@ static int mag3110_suspend(struct i2c_client *client, pm_message_t mesg)
if (data->active == MAG_ACTIVED) {
data->ctl_reg1 = mag3110_read_reg(client, MAG3110_CTRL_REG1);
ret = mag3110_write_reg(client, MAG3110_CTRL_REG1,
- data->ctl_reg1 & ~MAG3110_AC_MASK);
+ data->ctl_reg1 & ~MAG3110_AC_MASK);
}
return ret;
}
@@ -521,12 +530,12 @@ static int mag3110_resume(struct i2c_client *client)
struct mag3110_data *data = i2c_get_clientdata(client);
if (data->active == MAG_ACTIVED) {
ret = mag3110_write_reg(client, MAG3110_CTRL_REG1,
- data->ctl_reg1);
+ data->ctl_reg1);
if (data->ctl_reg1 & MAG3110_AC_MASK) {
- /* Read out MSB data to clear interrupt flag automatically */
+ /* Read out MSB data to clear interrupt automatically*/
mag3110_read_block_data(client, MAG3110_OUT_X_MSB,
- MAG3110_XYZ_DATA_LEN, tmp_data);
+ MAG3110_XYZ_DATA_LEN, tmp_data);
}
}
return ret;
@@ -545,7 +554,7 @@ static const struct i2c_device_id mag3110_id[] = {
MODULE_DEVICE_TABLE(i2c, mag3110_id);
static struct i2c_driver mag3110_driver = {
.driver = {.name = MAG3110_DRV_NAME,
- .owner = THIS_MODULE,},
+ .owner = THIS_MODULE,},
.suspend = mag3110_suspend,
.resume = mag3110_resume,
.probe = mag3110_probe,
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-15 19:10:03 +0000