Commit 3bf4a59c authored by Hans de Goede's avatar Hans de Goede Committed by Jonathan Cameron
Browse files

iio: light: cm32181: Add some extra register defines 



These come from a newer version of cm32181.c, which is floating around
the net, with a copyright of:

 * Copyright (C) 2014 Capella Microsystems Inc.
 * Author: Kevin Tsai <ktsai@capellamicro.com>
 *
 * 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.

Note that this removes the bogus CM32181_CMD_ALS_ENABLE define, there
is no enable bit, only a disable bit and enabled is the absence of
being disabled.

This is a preparation patch for adding support for the older
CM3218 model of the light sensor.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 44b9409c

drivers/iio/light/cm32181.c

+11 −4
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 


/* Registers Address */

#define CM32181_REG_ADDR_CMD		0x00

#define CM32181_REG_ADDR_WH		0x01

#define CM32181_REG_ADDR_WL		0x02

#define CM32181_REG_ADDR_TEST		0x03

#define CM32181_REG_ADDR_ALS		0x04

#define CM32181_REG_ADDR_STATUS		0x06

#define CM32181_REG_ADDR_ID		0x07
@@ -27,9 +30,13 @@ 
#define CM32181_CONF_REG_NUM		0x01



/* CMD register */

#define CM32181_CMD_ALS_ENABLE		0x00

#define CM32181_CMD_ALS_DISABLE		0x01

#define CM32181_CMD_ALS_INT_EN		0x02

#define CM32181_CMD_ALS_DISABLE		BIT(0)

#define CM32181_CMD_ALS_INT_EN		BIT(1)

#define CM32181_CMD_ALS_THRES_WINDOW	BIT(2)



#define CM32181_CMD_ALS_PERS_SHIFT	4

#define CM32181_CMD_ALS_PERS_MASK	(0x03 << CM32181_CMD_ALS_PERS_SHIFT)

#define CM32181_CMD_ALS_PERS_DEFAULT	(0x01 << CM32181_CMD_ALS_PERS_SHIFT)



#define CM32181_CMD_ALS_IT_SHIFT	6

#define CM32181_CMD_ALS_IT_MASK		(0x0F << CM32181_CMD_ALS_IT_SHIFT)
@@ -83,7 +90,7 @@ static int cm32181_reg_init(struct cm32181_chip *cm32181) 
		return -ENODEV;



	/* Default Values */

	cm32181->conf_regs[CM32181_REG_ADDR_CMD] = CM32181_CMD_ALS_ENABLE |

	cm32181->conf_regs[CM32181_REG_ADDR_CMD] =

			CM32181_CMD_ALS_IT_DEFAULT | CM32181_CMD_ALS_SM_DEFAULT;

	cm32181->calibscale = CM32181_CALIBSCALE_DEFAULT;