lis3: Add support for new LIS3DC / HP3DC chip
PATCH v2 1/1 lis3: Add support for new LIS3DC / HP3DC chip
A new version of LIS3 chip has slight incompatibilities from former versions. This patch adds the minimal support for it.
---v1->v2
Rebased to patch "lis3: Fix Oops with NULL platform data (v2)"
drivers/hwmon/lis3lv02d.c | 35 +++++++++++++++++++++++++++-------- drivers/hwmon/lis3lv02d.h | 17 +++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-)
drivers/hwmon/lis3lv02d.c +27 -8
@@ -162,6 +162,7 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)/* conversion btw sampling rate and the register values */ static int lis3_12_rates[4 ] = {40 ,160 ,640 ,2560 };static int lis3_8_rates[2 ] = {100 ,400 }; +static int lis3_3dc_rates[16 ] = {0 ,1 ,10 ,25 ,50 ,100 ,200 ,400 ,1600 ,5000 };/* ODR is Output Data Rate */ static int lis3lv02d_get_odr (void )
@@ -180,6 +181,9 @@ static int lis3lv02d_set_odr(int rate)u8 ctrl;int i, len, shift; +if (!rate) +return -EINVAL ; + lis3_dev.read (&lis3_dev,CTRL_REG1 , &ctrl); ctrl &= ~lis3_dev.odr_mask; len =1 <<hweight_long (lis3_dev.odr_mask);/* # of possible values */
@@ -196,19 +200,25 @@ static int lis3lv02d_set_odr(int rate)static int lis3lv02d_selftest (struct lis3lv02d *lis3,s16 results[3 ]) { -u8 reg; +u8 ctlreg, reg;s16 x, y, z;u8 selftest;int ret;mutex_lock (&lis3->mutex); -if (lis3_dev.whoami =WAI_12B ) - selftest =CTRL1_ST ; -else - selftest =CTRL1_STP ; +if (lis3_dev.whoami =WAI_3DC ) { + ctlreg =CTRL_REG4 ; + selftest =CTRL4_ST0 ; + }else { + ctlreg =CTRL_REG1 ; +if (lis3_dev.whoami =WAI_12B ) + selftest =CTRL1_ST ; +else + selftest =CTRL1_STP ; + } - lis3->read (lis3,CTRL_REG1 , ®); - lis3->write (lis3,CTRL_REG1 , (reg | selftest)); + lis3->read (lis3, ctlreg, ®); + lis3->write (lis3, ctlreg, (reg | selftest));msleep (lis3->pwron_delay /lis3lv02d_get_odr ());/* Read directly to avoid axis remap */
@@ -217,7 +227,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3]) z = lis3->read_data (lis3,OUTZ );/* back to normal settings */ - lis3->write (lis3,CTRL_REG1 , reg); + lis3->write (lis3, ctlreg, reg);msleep (lis3->pwron_delay /lis3lv02d_get_odr ()); results[0 ] = x - lis3->read_data (lis3,OUTX );
@@ -698,6 +708,15 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) dev->odr_mask =CTRL1_DR ; dev->scale =LIS3_SENSITIVITY_8B ;break ; +case WAI_3DC : + printk(KERN_INFO DRIVER_NAME ": 8 bits 3DC sensor found\n"); + dev->read_data = lis3lv02d_read_8; + dev->mdps_max_val =128 ; + dev->pwron_delay =LIS3_PWRON_DELAY_WAI_8B ; + dev->odrs = lis3_3dc_rates; + dev->odr_mask =CTRL1_ODR0 |CTRL1_ODR1 |CTRL1_ODR2 |CTRL1_ODR3 ; + dev->scale =LIS3_SENSITIVITY_8B ; +break ;default : printk(KERN_ERR DRIVER_NAME ": unknown sensor type 0x%X\n", dev->whoami);
drivers/hwmon/lis3lv02d.h +17 -0
@@ -45,6 +45,7 @@ enum lis3_reg {CTRL_REG1 =0x20 ,CTRL_REG2 =0x21 ,CTRL_REG3 =0x22 , +CTRL_REG4 =0x23 ,HP_FILTER_RESET =0x23 ,STATUS_REG =0x27 , OUTX_L = 0x28,
@@ -93,6 +94,7 @@ enum lis3lv02d_reg { };enum lis3_who_am_i { +WAI_3DC =0x33 ,/* 8 bits: LIS3DC, HP3DC */ WAI_12B =0x3A ,/* 12 bits: LIS3LV02D[LQ]... */ WAI_8B =0x3B ,/* 8 bits: LIS[23]02D[LQ]... */ WAI_6B =0x52 ,/* 6 bits: LIS331DLF - not supported */
@@ -118,6 +120,13 @@ enum lis3lv02d_ctrl1_8b { CTRL1_DR = 0x80, }; +enum lis3lv02d_ctrl1_3dc { +CTRL1_ODR0 =0x10 , +CTRL1_ODR1 =0x20 , +CTRL1_ODR2 =0x40 , +CTRL1_ODR3 =0x80 , +}; +enum lis3lv02d_ctrl2 {CTRL2_DAS =0x01 ,CTRL2_SIM =0x02 ,
@@ -129,6 +138,14 @@ enum lis3lv02d_ctrl2 { CTRL2_FS = 0x80, /* Full Scale selection */ }; +enum lis3lv02d_ctrl4_3dc { +CTRL4_SIM =0x01 , +CTRL4_ST0 =0x02 , +CTRL4_ST1 =0x04 , +CTRL4_FS0 =0x10 , +CTRL4_FS1 =0x20 , +}; +enum lis302d_ctrl2 {HP_FF_WU2 =0x08 ,HP_FF_WU1 =0x04 ,
Signature · 7 lines
1.7.2.2 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 4 lines · Takashi Iwai
A new version of LIS3 chip has slight incompatibilities from former versions. This patch adds the minimal support for it.
Signed-off-by Takashi Iwai <[email protected]>
Quoted 140 lines
---
v1->v2
Rebased to patch "lis3: Fix Oops with NULL platform data (v2)"drivers/hwmon/lis3lv02d.c | 35 +++++++++++++++++++++++++++-------- drivers/hwmon/lis3lv02d.h | 17 +++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-)drivers/hwmon/lis3lv02d.c +27
-8@@ -162,6 +162,7 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)/* conversion btw sampling rate and the register values */ static int lis3_12_rates[4 ] = {40 ,160 ,640 ,2560 };static int lis3_8_rates[2 ] = {100 ,400 }; +static int lis3_3dc_rates[16 ] = {0 ,1 ,10 ,25 ,50 ,100 ,200 ,400 ,1600 ,5000 };/* ODR is Output Data Rate */ static int lis3lv02d_get_odr (void )@@ -180,6 +181,9 @@ static int lis3lv02d_set_odr(int rate)u8 ctrl;int i, len, shift; +if (!rate) +return -EINVAL ; + lis3_dev.read (&lis3_dev,CTRL_REG1 , &ctrl); ctrl &= ~lis3_dev.odr_mask; len =1 <<hweight_long (lis3_dev.odr_mask);/* # of possible values */ @@ -196,19 +200,25 @@ static int lis3lv02d_set_odr(int rate)static int lis3lv02d_selftest (struct lis3lv02d *lis3,s16 results[3 ]) { -u8 reg; +u8 ctlreg, reg;s16 x, y, z;u8 selftest;int ret;mutex_lock (&lis3->mutex); -if (lis3_dev.whoami =WAI_12B ) - selftest =CTRL1_ST ; -else - selftest =CTRL1_STP ; +if (lis3_dev.whoami =WAI_3DC ) { + ctlreg =CTRL_REG4 ; + selftest =CTRL4_ST0 ; + }else { + ctlreg =CTRL_REG1 ; +if (lis3_dev.whoami =WAI_12B ) + selftest =CTRL1_ST ; +else + selftest =CTRL1_STP ; + } - lis3->read (lis3,CTRL_REG1 , ®); - lis3->write (lis3,CTRL_REG1 , (reg | selftest)); + lis3->read (lis3, ctlreg, ®); + lis3->write (lis3, ctlreg, (reg | selftest));msleep (lis3->pwron_delay /lis3lv02d_get_odr ());/* Read directly to avoid axis remap */ @@ -217,7 +227,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3]) z = lis3->read_data (lis3,OUTZ );/* back to normal settings */ - lis3->write (lis3,CTRL_REG1 , reg); + lis3->write (lis3, ctlreg, reg);msleep (lis3->pwron_delay /lis3lv02d_get_odr ()); results[0 ] = x - lis3->read_data (lis3,OUTX );@@ -698,6 +708,15 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) dev->odr_mask =CTRL1_DR ; dev->scale =LIS3_SENSITIVITY_8B ;break ; +case WAI_3DC : + printk(KERN_INFO DRIVER_NAME ": 8 bits 3DC sensor found\n"); + dev->read_data = lis3lv02d_read_8; + dev->mdps_max_val =128 ; + dev->pwron_delay =LIS3_PWRON_DELAY_WAI_8B ; + dev->odrs = lis3_3dc_rates; + dev->odr_mask =CTRL1_ODR0 |CTRL1_ODR1 |CTRL1_ODR2 |CTRL1_ODR3 ; + dev->scale =LIS3_SENSITIVITY_8B ; +break ;default : printk(KERN_ERR DRIVER_NAME ": unknown sensor type 0x%X\n", dev->whoami);drivers/hwmon/lis3lv02d.h +17
-0@@ -45,6 +45,7 @@ enum lis3_reg {CTRL_REG1 =0x20 ,CTRL_REG2 =0x21 ,CTRL_REG3 =0x22 , +CTRL_REG4 =0x23 ,HP_FILTER_RESET =0x23 ,STATUS_REG =0x27 , OUTX_L = 0x28,@@ -93,6 +94,7 @@ enum lis3lv02d_reg { };enum lis3_who_am_i { +WAI_3DC =0x33 ,/* 8 bits: LIS3DC, HP3DC */ WAI_12B =0x3A ,/* 12 bits: LIS3LV02D[LQ]... */ WAI_8B =0x3B ,/* 8 bits: LIS[23]02D[LQ]... */ WAI_6B =0x52 ,/* 6 bits: LIS331DLF - not supported */ @@ -118,6 +120,13 @@ enum lis3lv02d_ctrl1_8b { CTRL1_DR = 0x80, }; +enum lis3lv02d_ctrl1_3dc { +CTRL1_ODR0 =0x10 , +CTRL1_ODR1 =0x20 , +CTRL1_ODR2 =0x40 , +CTRL1_ODR3 =0x80 , +}; +enum lis3lv02d_ctrl2 {CTRL2_DAS =0x01 ,CTRL2_SIM =0x02 ,@@ -129,6 +138,14 @@ enum lis3lv02d_ctrl2 { CTRL2_FS = 0x80, /* Full Scale selection */ }; +enum lis3lv02d_ctrl4_3dc { +CTRL4_SIM =0x01 , +CTRL4_ST0 =0x02 , +CTRL4_ST1 =0x04 , +CTRL4_FS0 =0x10 , +CTRL4_FS1 =0x20 , +}; +enum lis302d_ctrl2 {HP_FF_WU2 =0x08 ,HP_FF_WU1 =0x04 ,Signature · 1 line
1.7.2.2
Signature · 8 lines
Guenter Roeck Distinguished Engineer PDU IP Systems _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 8 lines · On Thu, 23 Sep 2010 08:01:31 +0200 Takashi Iwai <[email protected]> wrote:
A new version of LIS3 chip has slight incompatibilities from former versions. This patch adds the minimal support for it.
Signed-off-by Takashi Iwai <[email protected]>---
v1->v2
Rebased to patch "lis3: Fix Oops with NULL platform data (v2)"
Wait. I did my own rebasing and came up with a different patch, with two extra hunks:
@@ -301,8 +311,9 @@ static irqreturn_t lis302dl_interrupt(in
wake_up_interruptible(&lis3_dev.misc_wait); kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
out:
- if (lis3_dev.pdata && lis3_dev.whoami = WAI_8B && lis3_dev.idev &&
- lis3_dev.idev->input->users)
+ if (lis3_dev.pdata &&
+ (lis3_dev.whoami = WAI_8B || lis3_dev.whoami = WAI_3DC) &&
+ lis3_dev.idev && lis3_dev.idev->input->users)
return IRQ_WAKE_THREAD;
return IRQ_HANDLED;
}
and
@@ -742,7 +762,7 @@ int lis3lv02d_init_device(struct lis3lv0
* io-apic is not configurable (and generates a warning) but I keep it
* in case of support for other hardware.
*/
- if (dev->pdata && dev->whoami = WAI_8B)
+ if (dev->pdata && (dev->whoami = WAI_8B || dev->whoami = WAI_3DC))
thread_fn = lis302dl_interrupt_thread1_8b;
else
thread_fn = NULL;
Did you drop those changes deliberately?
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
At Thu, 23 Sep 2010 12:43:13 -0700,
Quoted 42 lines · Andrew Morton
Quoted 8 lines · On Thu, 23 Sep 2010 08:01:31 +0200 Takashi Iwai <[email protected]> wrote:
A new version of LIS3 chip has slight incompatibilities from former versions. This patch adds the minimal support for it.
Signed-off-by Takashi Iwai <[email protected]>---
v1->v2
Rebased to patch "lis3: Fix Oops with NULL platform data (v2)"Wait. I did my own rebasing and came up with a different patch, with two extra hunks:
(quoted diff) +3
-2@@ -301,8 +311,9 @@ static irqreturn_t lis302dl_interrupt(in wake_up_interruptible(&lis3_dev.misc_wait); kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); out: - if (lis3_dev.pdata && lis3_dev.whoami = WAI_8B && lis3_dev.idev && - lis3_dev.idev->input->users) + if (lis3_dev.pdata && + (lis3_dev.whoami = WAI_8B || lis3_dev.whoami = WAI_3DC) && + lis3_dev.idev && lis3_dev.idev->input->users) return IRQ_WAKE_THREAD; return IRQ_HANDLED; }and
(quoted diff) +1
-1@@ -742,7 +762,7 @@ int lis3lv02d_init_device(struct lis3lv0 * io-apic is not configurable (and generates a warning) but I keep it * in case of support for other hardware. */ - if (dev->pdata && dev->whoami = WAI_8B) + if (dev->pdata && (dev->whoami = WAI_8B || dev->whoami = WAI_3DC)) thread_fn = lis302dl_interrupt_thread1_8b; else thread_fn = NULL;
Quoted 1 line
Did you drop those changes deliberately?
IMO, safer to drop these, so far.
For platform-specific, the driver requires the initialization of some registers, and currently it's only for WAI_8B chips. WAI_3DC has incompatibilities and cannot use it as is.
thanks,
Takashi
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
AppliedQuoted 4 lines · Takashi Iwai
A new version of LIS3 chip has slight incompatibilities from former versions. This patch adds the minimal support for it.
Signed-off-by Takashi Iwai <[email protected]>
Applied.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors