Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc updates from Greg KH: "Here is the "big" char/misc driver patchset for 4.13-rc1. Lots of stuff in here, a large thunderbolt update, w1 driver header reorg, the new mux driver subsystem, google firmware driver updates, and a raft of other smaller things. Full details in the shortlog. All of these have been in linux-next for a while with the only reported issue being a merge problem with this tree and the jc-docs tree in the w1 documentation area" * tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (147 commits) misc: apds990x: Use sysfs_match_string() helper mei: drop unreachable code in mei_start mei: validate the message header only in first fragment. DocBook: w1: Update W1 file locations and names in DocBook mux: adg792a: always require I2C support nvmem: rockchip-efuse: add support for rk322x-efuse nvmem: core: add locking to nvmem_find_cell nvmem: core: Call put_device() in nvmem_unregister() nvmem: core: fix leaks on registration errors nvmem: correct Broadcom OTP controller driver writes w1: Add subsystem kernel public interface drivers/fsi: Add module license to core driver drivers/fsi: Use asynchronous slave mode drivers/fsi: Add hub master support drivers/fsi: Add SCOM FSI client device driver drivers/fsi/gpio: Add tracepoints for GPIO master drivers/fsi: Add GPIO based FSI master drivers/fsi: Document FSI master sysfs files in ABI drivers/fsi: Add error handling for slave drivers/fsi: Add tracepoints for low-level operations ...
This commit is contained in:
Linus Torvalds
@@ -1,79 +0,0 @@
|
||||
/*
|
||||
* 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 __APDS990X_H__
|
||||
#define __APDS990X_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 apds990x_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.
|
||||
*
|
||||
*/
|
||||
|
||||
struct apds990x_platform_data {
|
||||
struct apds990x_chip_factors cf;
|
||||
u8 pdrive;
|
||||
u8 ppcount;
|
||||
int (*setup_resources)(void);
|
||||
int (*release_resources)(void);
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,53 +0,0 @@
|
||||
/*
|
||||
* This file is part of the ROHM BH1770GLC / OSRAM SFH7770 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 __BH1770_H__
|
||||
#define __BH1770_H__
|
||||
|
||||
/**
|
||||
* struct bh1770_platform_data - platform data for bh1770glc driver
|
||||
* @led_def_curr: IR led driving current.
|
||||
* @glass_attenuation: Attenuation factor for covering window.
|
||||
* @setup_resources: Call back for interrupt line setup function
|
||||
* @release_resources: Call back for interrupte line release function
|
||||
*
|
||||
* Example of glass attenuation: 16384 * 385 / 100 means attenuation factor
|
||||
* of 3.85. i.e. light_above_sensor = light_above_cover_window / 3.85
|
||||
*/
|
||||
|
||||
struct bh1770_platform_data {
|
||||
#define BH1770_LED_5mA 0
|
||||
#define BH1770_LED_10mA 1
|
||||
#define BH1770_LED_20mA 2
|
||||
#define BH1770_LED_50mA 3
|
||||
#define BH1770_LED_100mA 4
|
||||
#define BH1770_LED_150mA 5
|
||||
#define BH1770_LED_200mA 6
|
||||
__u8 led_def_curr;
|
||||
#define BH1770_NEUTRAL_GA 16384 /* 16384 / 16384 = 1 */
|
||||
__u32 glass_attenuation;
|
||||
int (*setup_resources)(void);
|
||||
int (*release_resources)(void);
|
||||
};
|
||||
#endif
|
||||
Reference in New Issue
Block a user