Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d5eca53 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Sensors: Add Avago APDS9930 driver"

parents 73bbe129 59697a5b

drivers/misc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -313,6 +313,16 @@ config APDS9802ALS 
	  This driver can also be built as a module.  If so, the module

	  will be called apds9802als.



config APDS9930

	tristate "Avago APDS9930 combined als and proximity sensors"

	depends on I2C

	help

	  Say Y here if you want to build a driver for Avago APDS9930

	  combined ambient light and proximity sensor chip.



	  To compile this driver as a module, choose M here: the

	  module will be called apds9950. If unsure, say N here.



config ISL29003

	tristate "Intersil ISL29003 ambient light sensor"

	depends on I2C && SYSFS

drivers/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_SGI_GRU) += sgi-gru/ 
obj-$(CONFIG_CS5535_MFGPT)	+= cs5535-mfgpt.o

obj-$(CONFIG_HP_ILO)		+= hpilo.o

obj-$(CONFIG_APDS9802ALS)	+= apds9802als.o

obj-$(CONFIG_APDS9930)		+= apds993x.o

obj-$(CONFIG_ISL29003)		+= isl29003.o

obj-$(CONFIG_ISL29020)		+= isl29020.o

obj-$(CONFIG_USB_HSIC_SMSC_HUB) += smsc_hub.o

drivers/misc/apds993x.c

0 → 100644
+2149 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/i2c/apds993x.h

0 → 100644
+120 −0
Original line number Diff line number Diff line 
/*

 * This file is part of the APDS990x sensor driver.

 * Chip is combined proximity and ambient light sensor.

 *

 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).

 *

 * Contact: Samu Onkalo <samu.p.onkalo@nokia.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.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#ifndef __APDS993X_H__

#define __APDS993X_H__



#define APDS_IRLED_CURR_12mA	0x3

#define APDS_IRLED_CURR_25mA	0x2

#define APDS_IRLED_CURR_50mA	0x1

#define APDS_IRLED_CURR_100mA	0x0



/**

 * struct apds990x_chip_factors - defines effect of the cover window

 * @ga: Total glass attenuation

 * @cf1: clear channel factor 1 for raw to lux conversion

 * @irf1: IR channel factor 1 for raw to lux conversion

 * @cf2: clear channel factor 2 for raw to lux conversion

 * @irf2: IR channel factor 2 for raw to lux conversion

 * @df: device factor for conversion formulas

 *

 * Structure for tuning ALS calculation to match with environment.

 * Values depend on the material above the sensor and the sensor

 * itself. If the GA is zero, driver will use uncovered sensor default values

 * format: decimal value * APDS_PARAM_SCALE except df which is plain integer.

 */

#define APDS_PARAM_SCALE 4096

struct apds993x_chip_factors {

	int ga;

	int cf1;

	int irf1;

	int cf2;

	int irf2;

	int df;

};



/**

 * struct apds990x_platform_data - platform data for apsd990x.c driver

 * @cf: chip factor data

 * @pddrive: IR-led driving current

 * @ppcount: number of IR pulses used for proximity estimation

 * @setup_resources: interrupt line setup call back function

 * @release_resources: interrupt line release call back function

 *

 * Proximity detection result depends heavily on correct ppcount, pdrive

 * and cover window.

 *

 */



/* Analog voltage @2.7 V */

#define AVDD_VTG_MIN_UV		3000000

#define AVDD_VTG_MAX_UV		3000000

#define AVDD_ACTIVE_LOAD_UA	15000



/* Digital voltage @1.8 V */

#define VDDIO_VTG_DIG_MIN_UV	1800000

#define VDDIO_VTG_DIG_MAX_UV	1800000

#define VDDIO_ACTIVE_LOAD_DIG_UA	10000



#define VDDIO_I2C_VTG_MIN_UV	1800000

#define VDDIO_I2C_VTG_MAX_UV	1800000

#define VDDIO_I2C_LOAD_UA		10000





struct apds993x_platform_data {

	struct apds993x_chip_factors cf;

	u8	   pdrive;

	unsigned int  ppcount;

	int    (*setup_resources)(void);

	int    (*release_resources)(void);



	int irq_num;

	int (*power)(unsigned char onoff);

	int (*init)(void);

	void (*exit)(void);

	int (*power_on)(bool);



	unsigned int prox_int_low_threshold;

	unsigned int prox_int_high_threshold;

	unsigned int als_threshold_hsyteresis;

	unsigned int B;

	unsigned int C;

	unsigned int D;

	unsigned int alsit;

	unsigned int ga_value;

	unsigned int df_value;

	unsigned int atime;



	bool i2c_pull_up;

	bool digital_pwr_regulator;



	unsigned int irq_gpio;

	u32 irq_gpio_flags;



	struct regulator *vcc_ana;

	struct regulator *vcc_dig;

	struct regulator *vcc_i2c;

};



#endif