lis3: fix typo
PATCH 1/4 lis3: fix typo
Bit 0x80 in CTRL_REG3 is an ACTIVE_LOW rather than an ACTIVE_HIGH function, I got that wrong during my last change.
--- include/linux/lis3lv02d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/lis3lv02d.h +1 -1
@@ -32,7 +32,7 @@ struct lis3lv02d_platform_data {#define LIS3_IRQ2_DATA_READY (4 << 3)#define LIS3_IRQ2_CLICK (7 << 3)#define LIS3_IRQ_OPEN_DRAIN (1 << 6) -#define LIS3_IRQ_ACTIVE_HIGH (1 << 7) +#define LIS3_IRQ_ACTIVE_LOW (1 << 7)unsigned char irq_cfg; };
Signature · 1 line
1.6.3.1
PATCH 2/4 lis3: add free-fall/wakeup function via platform_data
This offers a way for platforms to define flags and thresholds for the free-fall/wakeup functions of the lis302d chips.
More registers needed to be seperated as they are specific to the different models.
--- drivers/hwmon/lis3lv02d.c | 9 +++++++++ drivers/hwmon/lis3lv02d.h | 24 ++++++++++++++++++------ include/linux/lis3lv02d.h | 9 +++++++++ 3 files changed, 36 insertions(+), 6 deletions(-)
drivers/hwmon/lis3lv02d.c +9 -0
@@ -454,6 +454,15 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) (p->click_thresh_y << 4)); } +if (p->wakeup_flags && (dev->whoami ==LIS_SINGLE_ID )) { + dev->write (dev,FF_WU_CFG_1 , p->wakeup_flags); + dev->write (dev,FF_WU_THS_1 , p->wakeup_thresh &0x7f ); +/* default to 2.5ms for now */ + dev->write (dev,FF_WU_DURATION_1 ,1 ); +/* enable high pass filter for both free-fall units */ + dev->write (dev,CTRL_REG2 ,HP_FF_WU1 |HP_FF_WU2 ); + } +if (p->irq_cfg) dev->write (dev,CTRL_REG3 , p->irq_cfg); }
drivers/hwmon/lis3lv02d.h +18 -6
@@ -58,15 +58,17 @@ enum lis3_reg {OUTZ_L =0x2C ,OUTZ_H =0x2D , OUTZ = 0x2D, -FF_WU_CFG =0x30 , -FF_WU_SRC =0x31 , -FF_WU_ACK =0x32 , -FF_WU_THS_L =0x34 , -FF_WU_THS_H =0x35 , - FF_WU_DURATION = 0x36, };enum lis302d_reg { +FF_WU_CFG_1 =0x30 , +FF_WU_SRC_1 =0x31 , +FF_WU_THS_1 =0x32 , +FF_WU_DURATION_1 =0x33 , +FF_WU_CFG_2 =0x34 , +FF_WU_SRC_2 =0x35 , +FF_WU_THS_2 =0x36 , +FF_WU_DURATION_2 =0x37 ,CLICK_CFG =0x38 ,CLICK_SRC =0x39 , CLICK_THSY_X = 0x3B,
@@ -77,6 +79,12 @@ enum lis302d_reg { };enum lis3lv02d_reg { +FF_WU_CFG =0x30 , +FF_WU_SRC =0x31 , +FF_WU_ACK =0x32 , +FF_WU_THS_L =0x34 , +FF_WU_THS_H =0x35 , +FF_WU_DURATION =0x36 ,DD_CFG =0x38 ,DD_SRC =0x39 ,DD_ACK =0x3A ,
@@ -107,6 +115,10 @@ enum lis3lv02d_ctrl2 { CTRL2_FS = 0x80, /* Full Scale selection */ }; +enum lis302d_ctrl2 { +HP_FF_WU2 =0x08 , +HP_FF_WU1 =0x04 , +};enum lis3lv02d_ctrl3 {CTRL3_CFS0 =0x01 ,
include/linux/lis3lv02d.h +9 -0
@@ -34,6 +34,15 @@ struct lis3lv02d_platform_data {#define LIS3_IRQ_OPEN_DRAIN (1 << 6)#define LIS3_IRQ_ACTIVE_LOW (1 << 7)unsigned char irq_cfg; + +#define LIS3_WAKEUP_X_LO (1 << 0) +#define LIS3_WAKEUP_X_HI (1 << 1) +#define LIS3_WAKEUP_Y_LO (1 << 2) +#define LIS3_WAKEUP_Y_HI (1 << 3) +#define LIS3_WAKEUP_Z_LO (1 << 4) +#define LIS3_WAKEUP_Z_HI (1 << 5) +unsigned char wakeup_flags; + unsigned char wakeup_thresh; };#endif /* __LIS3LV02D_H_ */
Signature · 1 line
1.6.3.1
PATCH 3/4 piis3: add power management functions
This enabled power management functions for the SPI transport layer of the lis3 devices. The device's suspend mode is only entered in case no wakeup threshold has been given. In this case, the device is supposed to wake up the system and must thus not be put to deep sleep.
--- drivers/hwmon/lis3lv02d_spi.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)
drivers/hwmon/lis3lv02d_spi.c +28 -0
@@ -87,6 +87,32 @@ static int __devexit lis302dl_spi_remove(struct spi_device *spi)return 0 ; } +#ifdef CONFIG_PM +static int lis3lv02d_spi_suspend (struct spi_device *spi,pm_message_t mesg) +{ +struct lis3lv02d *lis3 =spi_get_drvdata (spi); + +if (!lis3->pdata->wakeup_flags) +lis3lv02d_poweroff (&lis3_dev); + +return 0 ; +} + +static int lis3lv02d_spi_resume (struct spi_device *spi) +{ +struct lis3lv02d *lis3 =spi_get_drvdata (spi); + +if (!lis3->pdata->wakeup_flags) +lis3lv02d_poweron (lis3); + +return 0 ; +} + +#else +#define lis3_spi_suspend NULL +#define lis3_spi_resume NULL +#endif +static struct spi_driver lis302dl_spi_driver = { .driver = { .name =DRV_NAME ,
@@ -94,6 +120,8 @@ static struct spi_driver lis302dl_spi_driver = { }, .probe = lis302dl_spi_probe, .remove = __devexit_p(lis302dl_spi_remove), + .suspend = lis3lv02d_spi_suspend, + .resume = lis3lv02d_spi_resume, };static int __init lis302dl_init (void )
Signature · 1 line
1.6.3.1
PATCH 4/4 lis3_spi: code cleanups
--- drivers/hwmon/lis3lv02d_spi.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-)
drivers/hwmon/lis3lv02d_spi.c +8 -9
@@ -66,17 +66,16 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)if (ret <0 )return ret; - lis3_dev.bus_priv = spi; - lis3_dev.init = lis3_spi_init; - lis3_dev.read = lis3_spi_read; - lis3_dev.write = lis3_spi_write; - lis3_dev.irq = spi->irq; - lis3_dev.ac = lis3lv02d_axis_normal; - lis3_dev.pdata = spi->dev.platform_data; + lis3_dev.bus_priv = spi; + lis3_dev.init = lis3_spi_init; + lis3_dev.read = lis3_spi_read; + lis3_dev.write = lis3_spi_write; + lis3_dev.irq = spi->irq; + lis3_dev.ac = lis3lv02d_axis_normal; + lis3_dev.pdata = spi->dev.platform_data;spi_set_drvdata (spi, &lis3_dev); - ret =lis3lv02d_init_device (&lis3_dev); -return ret; +return lis3lv02d_init_device (&lis3_dev); } static int __devexit lis302dl_spi_remove(struct spi_device *spi)
Signature · 1 line
1.6.3.1
Quoted 2 lines · Daniel Mack
Bit
0x80inCTRL_REG3is anACTIVE_LOWrather than anACTIVE_HIGHfunction, I got that wrong during my last change.
Whole series looks okay to me, but I did not check the data sheets.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html