6 files changed, 328 insertions, 19 deletions

diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h
index 1fc7abd28b0b..730ead1a46df 100644
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
@@ -127,7 +127,7 @@ void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev);
 int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
 
 #define __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
-        _storagebits, _shift, _extend_name, _type) \
+        _storagebits, _shift, _extend_name, _type, _mask_all) \
         { \
                 .type = (_type), \
                 .differential = (_channel2 == -1 ? 0 : 1), \
@@ -139,7 +139,7 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                         BIT(IIO_CHAN_INFO_OFFSET), \
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
+                .info_mask_shared_by_all = _mask_all, \
                 .scan_index = (_si), \
                 .scan_type = { \
                         .sign = 'u', \
@@ -153,25 +153,35 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
 #define AD_SD_DIFF_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_VOLTAGE)
+                _storagebits, _shift, NULL, IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_SHORTED_CHANNEL(_si, _channel, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel, _channel, _address, _bits, \
-                _storagebits, _shift, "shorted", IIO_VOLTAGE)
+                _storagebits, _shift, "shorted", IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_CHANNEL(_si, _channel, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_VOLTAGE)
+                _storagebits, _shift, NULL, IIO_VOLTAGE, \
+                 BIT(IIO_CHAN_INFO_SAMP_FREQ))
+
+#define AD_SD_CHANNEL_NO_SAMP_FREQ(_si, _channel, _address, _bits, \
+        _storagebits, _shift) \
+        __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
+                _storagebits, _shift, NULL, IIO_VOLTAGE, 0)
 
 #define AD_SD_TEMP_CHANNEL(_si, _address, _bits, _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, 0, -1, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_TEMP)
+                _storagebits, _shift, NULL, IIO_TEMP, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_SUPPLY_CHANNEL(_si, _channel, _address, _bits, _storagebits, \
         _shift) \
         __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
-                _storagebits, _shift, "supply", IIO_VOLTAGE)
+                _storagebits, _shift, "supply", IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #endif
diff --git a/include/linux/iio/adc/stm32-dfsdm-adc.h b/include/linux/iio/adc/stm32-dfsdm-adc.h
index e7dc7a542a4e..0da298b41737 100644
--- a/include/linux/iio/adc/stm32-dfsdm-adc.h
+++ b/include/linux/iio/adc/stm32-dfsdm-adc.h
@@ -9,6 +9,8 @@
 #ifndef STM32_DFSDM_ADC_H
 #define STM32_DFSDM_ADC_H
 
+#include <linux/iio/iio.h>
+
 int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev,
                             int (*cb)(const void *data, size_t size,
                                       void *private),
diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
new file mode 100644
index 000000000000..ce16445411ac
--- /dev/null
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -0,0 +1,180 @@
+/*
+ * ChromeOS EC sensor hub
+ *
+ * Copyright (C) 2016 Google, Inc
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#ifndef __CROS_EC_SENSORS_CORE_H
+#define __CROS_EC_SENSORS_CORE_H
+
+#include <linux/iio/iio.h>
+#include <linux/irqreturn.h>
+#include <linux/mfd/cros_ec.h>
+
+enum {
+        CROS_EC_SENSOR_X,
+        CROS_EC_SENSOR_Y,
+        CROS_EC_SENSOR_Z,
+        CROS_EC_SENSOR_MAX_AXIS,
+};
+
+/* EC returns sensor values using signed 16 bit registers */
+#define CROS_EC_SENSOR_BITS 16
+
+/*
+ * 4 16 bit channels are allowed.
+ * Good enough for current sensors, they use up to 3 16 bit vectors.
+ */
+#define CROS_EC_SAMPLE_SIZE  (sizeof(s64) * 2)
+
+/* Minimum sampling period to use when device is suspending */
+#define CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY 1000  /* 1 second */
+
+/**
+ * struct cros_ec_sensors_core_state - state data for EC sensors IIO driver
+ * @ec:                         cros EC device structure
+ * @cmd_lock:                   lock used to prevent simultaneous access to the
+ *                              commands.
+ * @msg:                        cros EC command structure
+ * @param:                      motion sensor parameters structure
+ * @resp:                       motion sensor response structure
+ * @type:                       type of motion sensor
+ * @loc:                        location where the motion sensor is placed
+ * @calib:                      calibration parameters. Note that trigger
+ *                              captured data will always provide the calibrated
+ *                              data
+ * @samples:                    static array to hold data from a single capture.
+ *                              For each channel we need 2 bytes, except for
+ *                              the timestamp. The timestamp is always last and
+ *                              is always 8-byte aligned.
+ * @read_ec_sensors_data:       function used for accessing sensors values
+ * @cuur_sampl_freq:            current sampling period
+ */
+struct cros_ec_sensors_core_state {
+        struct cros_ec_device *ec;
+        struct mutex cmd_lock;
+
+        struct cros_ec_command *msg;
+        struct ec_params_motion_sense param;
+        struct ec_response_motion_sense *resp;
+
+        enum motionsensor_type type;
+        enum motionsensor_location loc;
+
+        s16 calib[CROS_EC_SENSOR_MAX_AXIS];
+
+        u8 samples[CROS_EC_SAMPLE_SIZE];
+
+        int (*read_ec_sensors_data)(struct iio_dev *indio_dev,
+                                    unsigned long scan_mask, s16 *data);
+
+        int curr_sampl_freq;
+};
+
+/**
+ * cros_ec_sensors_read_lpc() - retrieve data from EC shared memory
+ * @indio_dev:  pointer to IIO device
+ * @scan_mask:  bitmap of the sensor indices to scan
+ * @data:       location to store data
+ *
+ * This is the safe function for reading the EC data. It guarantees that the
+ * data sampled was not modified by the EC while being read.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+/**
+ * cros_ec_sensors_read_cmd() - retrieve data using the EC command protocol
+ * @indio_dev:  pointer to IIO device
+ * @scan_mask:  bitmap of the sensor indices to scan
+ * @data:       location to store data
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+struct platform_device;
+/**
+ * cros_ec_sensors_core_init() - basic initialization of the core structure
+ * @pdev:               platform device created for the sensors
+ * @indio_dev:          iio device structure of the device
+ * @physical_device:    true if the device refers to a physical device
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_core_init(struct platform_device *pdev,
+                              struct iio_dev *indio_dev, bool physical_device);
+
+/**
+ * cros_ec_sensors_capture() - the trigger handler function
+ * @irq:        the interrupt number.
+ * @p:          a pointer to the poll function.
+ *
+ * On a trigger event occurring, if the pollfunc is attached then this
+ * handler is called as a threaded interrupt (and hence may sleep). It
+ * is responsible for grabbing data from the device and pushing it into
+ * the associated buffer.
+ *
+ * Return: IRQ_HANDLED
+ */
+irqreturn_t cros_ec_sensors_capture(int irq, void *p);
+
+/**
+ * cros_ec_motion_send_host_cmd() - send motion sense host command
+ * @st:         pointer to state information for device
+ * @opt_length: optional length to reduce the response size, useful on the data
+ *              path. Otherwise, the maximal allowed response size is used
+ *
+ * When called, the sub-command is assumed to be set in param->cmd.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *st,
+                                 u16 opt_length);
+
+/**
+ * cros_ec_sensors_core_read() - function to request a value from the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        will contain one element making up the returned value
+ * @val2:       will contain another element making up the returned value
+ * @mask:       specifies which values to be requested
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
+                              struct iio_chan_spec const *chan,
+                              int *val, int *val2, long mask);
+
+/**
+ * cros_ec_sensors_core_write() - function to write a value to the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        first part of value to write
+ * @val2:       second part of value to write
+ * @mask:       specifies which values to write
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
+                               struct iio_chan_spec const *chan,
+                               int val, int val2, long mask);
+
+extern const struct dev_pm_ops cros_ec_sensors_pm_ops;
+
+/* List of extended channel specification for all sensors */
+extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];
+
+#endif  /* __CROS_EC_SENSORS_CORE_H */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 11579fd4126e..a74cb177dc6f 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -183,18 +183,18 @@ struct iio_event_spec {
  * @address:            Driver specific identifier.
  * @scan_index:         Monotonic index to give ordering in scans when read
  *                      from a buffer.
- * @scan_type:          sign:           's' or 'u' to specify signed or unsigned
- *                      realbits:       Number of valid bits of data
- *                      storagebits:    Realbits + padding
- *                      shift:          Shift right by this before masking out
- *                                      realbits.
- *                      repeat:         Number of times real/storage bits
- *                                      repeats. When the repeat element is
- *                                      more than 1, then the type element in
- *                                      sysfs will show a repeat value.
- *                                      Otherwise, the number of repetitions is
- *                                      omitted.
- *                      endianness:     little or big endian
+ * @scan_type:          struct describing the scan type
+ * @scan_type.sign:             's' or 'u' to specify signed or unsigned
+ * @scan_type.realbits:         Number of valid bits of data
+ * @scan_type.storagebits:      Realbits + padding
+ * @scan_type.shift:            Shift right by this before masking out
+ *                              realbits.
+ * @scan_type.repeat:           Number of times real/storage bits repeats.
+ *                              When the repeat element is more than 1, then
+ *                              the type element in sysfs will show a repeat
+ *                              value. Otherwise, the number of repetitions
+ *                              is omitted.
+ * @scan_type.endianness:       little or big endian
  * @info_mask_separate: What information is to be exported that is specific to
  *                      this channel.
  * @info_mask_separate_available: What availability information is to be
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7c4e8f1f72d8..d23123238534 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -966,6 +966,22 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
                          "pointer type mismatch in container_of()");    \
         ((type *)(__mptr - offsetof(type, member))); })
 
+/**
+ * container_of_safe - cast a member of a structure out to the containing structure
+ * @ptr:        the pointer to the member.
+ * @type:       the type of the container struct this is embedded in.
+ * @member:     the name of the member within the struct.
+ *
+ * If IS_ERR_OR_NULL(ptr), ptr is returned unchanged.
+ */
+#define container_of_safe(ptr, type, member) ({                         \
+        void *__mptr = (void *)(ptr);                                   \
+        BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) &&   \
+                         !__same_type(*(ptr), void),                    \
+                         "pointer type mismatch in container_of()");    \
+        IS_ERR_OR_NULL(__mptr) ? ERR_CAST(__mptr) :                     \
+                ((type *)(__mptr - offsetof(type, member))); })
+
 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
diff --git a/include/linux/platform_data/tsl2772.h b/include/linux/platform_data/tsl2772.h
new file mode 100644
index 000000000000..f8ade15a35e2
--- /dev/null
+++ b/include/linux/platform_data/tsl2772.h
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Device driver for monitoring ambient light intensity (lux)
+ * and proximity (prox) within the TAOS TSL2772 family of devices.
+ *
+ * Copyright (c) 2012, TAOS Corporation.
+ * Copyright (c) 2017-2018 Brian Masney <masneyb@onstation.org>
+ */
+
+#ifndef __TSL2772_H
+#define __TSL2772_H
+
+struct tsl2772_lux {
+        unsigned int ch0;
+        unsigned int ch1;
+};
+
+/* Max number of segments allowable in LUX table */
+#define TSL2772_MAX_LUX_TABLE_SIZE              6
+/* The default LUX tables all have 3 elements.  */
+#define TSL2772_DEF_LUX_TABLE_SZ                3
+#define TSL2772_DEFAULT_TABLE_BYTES (sizeof(struct tsl2772_lux) * \
+                                     TSL2772_DEF_LUX_TABLE_SZ)
+
+/* Proximity diode to use */
+#define TSL2772_DIODE0                  0x01
+#define TSL2772_DIODE1                  0x02
+#define TSL2772_DIODE_BOTH              0x03
+
+/* LED Power */
+#define TSL2772_100_mA                  0x00
+#define TSL2772_50_mA                   0x01
+#define TSL2772_25_mA                   0x02
+#define TSL2772_13_mA                   0x03
+
+/**
+ * struct tsl2772_settings - Settings for the tsl2772 driver
+ *  @als_time:              Integration time of the ALS channel ADCs in 2.73 ms
+ *                          increments. Total integration time is
+ *                          (256 - als_time) * 2.73.
+ *  @als_gain:              Index into the tsl2772_als_gain array.
+ *  @als_gain_trim:         Default gain trim to account for aperture effects.
+ *  @wait_time:             Time between proximity and ALS cycles in 2.73
+ *                          periods.
+ *  @prox_time:             Integration time of the proximity ADC in 2.73 ms
+ *                          increments. Total integration time is
+ *                          (256 - prx_time) * 2.73.
+ *  @prox_gain:             Index into the tsl2772_prx_gain array.
+ *  @als_prox_config:       The value of the ALS / Proximity configuration
+ *                          register.
+ *  @als_cal_target:        Known external ALS reading for calibration.
+ *  @als_persistence:       H/W Filters, Number of 'out of limits' ALS readings.
+ *  @als_interrupt_en:      Enable/Disable ALS interrupts
+ *  @als_thresh_low:        CH0 'low' count to trigger interrupt.
+ *  @als_thresh_high:       CH0 'high' count to trigger interrupt.
+ *  @prox_persistence:      H/W Filters, Number of 'out of limits' proximity
+ *                          readings.
+ *  @prox_interrupt_en:     Enable/Disable proximity interrupts.
+ *  @prox_thres_low:        Low threshold proximity detection.
+ *  @prox_thres_high:       High threshold proximity detection.
+ *  @prox_pulse_count:      Number if proximity emitter pulses.
+ *  @prox_max_samples_cal:  The number of samples that are taken when performing
+ *                          a proximity calibration.
+ *  @prox_diode             Which diode(s) to use for driving the external
+ *                          LED(s) for proximity sensing.
+ *  @prox_power             The amount of power to use for the external LED(s).
+ */
+struct tsl2772_settings {
+        int als_time;
+        int als_gain;
+        int als_gain_trim;
+        int wait_time;
+        int prox_time;
+        int prox_gain;
+        int als_prox_config;
+        int als_cal_target;
+        u8 als_persistence;
+        bool als_interrupt_en;
+        int als_thresh_low;
+        int als_thresh_high;
+        u8 prox_persistence;
+        bool prox_interrupt_en;
+        int prox_thres_low;
+        int prox_thres_high;
+        int prox_pulse_count;
+        int prox_max_samples_cal;
+        int prox_diode;
+        int prox_power;
+};
+
+/**
+ * struct tsl2772_platform_data - Platform callback, glass and defaults
+ * @platform_lux_table:        Device specific glass coefficents
+ * @platform_default_settings: Device specific power on defaults
+ */
+struct tsl2772_platform_data {
+        struct tsl2772_lux platform_lux_table[TSL2772_MAX_LUX_TABLE_SIZE];
+        struct tsl2772_settings *platform_default_settings;
+};
+
+#endif /* __TSL2772_H */