Changes in 4.9.207 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator usb: gadget: u_serial: add missing port entry locking tty: serial: fsl_lpuart: use the sg count from dma_map_sg tty: serial: msm_serial: Fix flow control serial: pl011: Fix DMA ->flush_buffer() serial: serial_core: Perform NULL checks for break_ctl ops serial: ifx6x60: add missed pm_runtime_disable autofs: fix a leak in autofs_expire_indirect() RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN exportfs_decode_fh(): negative pinned may become positive without the parent locked audit_get_nd(): don't unlock parent too early NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error Input: cyttsp4_core - fix use after free bug ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() rsxx: add missed destroy_workqueue calls in remove net: ep93xx_eth: fix mismatch of request_mem_region in remove serial: core: Allow processing sysrq at port unlock time cxgb4vf: fix memleak in mac_hlist initialization iwlwifi: mvm: Send non offchannel traffic via AP sta ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+ net/mlx5: Release resource on error flow extcon: max8997: Fix lack of path setting in USB device mode clk: rockchip: fix rk3188 sclk_smc gate data clk: rockchip: fix rk3188 sclk_mac_lbtest parameter ordering ARM: dts: rockchip: Fix rk3288-rock2 vcc_flash name dlm: fix missing idr_destroy for recover_idr MIPS: SiByte: Enable ZONE_DMA32 for LittleSur scsi: zfcp: drop default switch case which might paper over missing case pinctrl: qcom: ssbi-gpio: fix gpio-hog related boot issues Staging: iio: adt7316: Fix i2c data reading, set the data field regulator: Fix return value of _set_load() stub MIPS: OCTEON: octeon-platform: fix typing math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning rtc: max8997: Fix the returned value in case of error in 'max8997_rtc_read_alarm()' rtc: dt-binding: abx80x: fix resistance scale ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module media: pulse8-cec: return 0 when invalidating the logical address dmaengine: coh901318: Fix a double-lock bug dmaengine: coh901318: Remove unused variable usb: dwc3: don't log probe deferrals; but do log other error codes ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion() dma-mapping: fix return type of dma_set_max_seg_size() altera-stapl: check for a null key before strcasecmp'ing it serial: imx: fix error handling in console_setup i2c: imx: don't print error message on probe defer dlm: NULL check before kmem_cache_destroy is not needed ARM: debug: enable UART1 for socfpga Cyclone5 nfsd: fix a warning in __cld_pipe_upcall() ARM: OMAP1/2: fix SoC name printing net/x25: fix called/calling length calculation in x25_parse_address_block net/x25: fix null_x25_address handling ARM: dts: mmp2: fix the gpio interrupt cell number ARM: dts: realview-pbx: Fix duplicate regulator nodes tcp: fix off-by-one bug on aborting window-probing socket tcp: fix SNMP TCP timeout under-estimation modpost: skip ELF local symbols during section mismatch check kbuild: fix single target build for external module mtd: fix mtd_oobavail() incoherent returned value ARM: dts: pxa: clean up USB controller nodes clk: sunxi-ng: h3/h5: Fix CSI_MCLK parent ARM: dts: realview: Fix some more duplicate regulator nodes dlm: fix invalid cluster name warning net/mlx4_core: Fix return codes of unsupported operations powerpc/math-emu: Update macros from GCC MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition nfsd: Return EPERM, not EACCES, in some SETATTR cases tty: Don't block on IO when ldisc change is pending media: stkwebcam: Bugfix for wrong return values mlx4: Use snprintf instead of complicated strcpy ARM: dts: sunxi: Fix PMU compatible strings sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision fuse: verify nlink fuse: verify attributes ALSA: pcm: oss: Avoid potential buffer overflows Input: goodix - add upside-down quirk for Teclast X89 tablet coresight: etm4x: Fix input validation for sysfs. x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks CIFS: Fix SMB2 oplock break processing tty: vt: keyboard: reject invalid keycodes can: slcan: Fix use-after-free Read in slcan_open jbd2: Fix possible overflow in jbd2_log_space_left() drm/i810: Prevent underflow in ioctl KVM: x86: do not modify masked bits of shared MSRs KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr crypto: ccp - fix uninitialized list head crypto: ecdh - fix big endian bug in ECC library crypto: user - fix memory leak in crypto_report spi: atmel: Fix CS high support RDMA/qib: Validate ->show()/store() callbacks before calling them thermal: Fix deadlock in thermal thermal_zone_device_check KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) appletalk: Fix potential NULL pointer dereference in unregister_snap_client appletalk: Set error code if register_snap_client failed usb: gadget: configfs: Fix missing spin_lock_init() USB: uas: honor flag to avoid CAPACITY16 USB: uas: heed CAPACITY_HEURISTICS usb: Allow USB device to be warm reset in suspended state staging: rtl8188eu: fix interface sanity check staging: rtl8712: fix interface sanity check staging: gigaset: fix general protection fault on probe staging: gigaset: fix illegal free on probe errors staging: gigaset: add endpoint-type sanity check xhci: Increase STS_HALT timeout in xhci_suspend() ARM: dts: pandora-common: define wl1251 as child node of mmc3 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting USB: atm: ueagle-atm: add missing endpoint check USB: idmouse: fix interface sanity checks USB: serial: io_edgeport: fix epic endpoint lookup USB: adutux: fix interface sanity check usb: core: urb: fix URB structure initialization function usb: mon: Fix a deadlock in usbmon between mmap and read mtd: spear_smi: Fix Write Burst mode virtio-balloon: fix managed page counts when migrating pages between zones btrfs: check page->mapping when loading free space cache btrfs: Remove btrfs_bio::flags member Btrfs: send, skip backreference walking for extents with many references btrfs: record all roots for rename exchange on a subvol rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer rtlwifi: rtl8192de: Fix missing enable interrupt flag lib: raid6: fix awk build warnings ALSA: hda - Fix pending unsol events at shutdown workqueue: Fix spurious sanity check failures in destroy_workqueue() workqueue: Fix pwq ref leak in rescuer_thread() ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report blk-mq: avoid sysfs buffer overflow with too many CPU cores cgroup: pids: use atomic64_t for pids->limit ar5523: check NULL before memcpy() in ar5523_cmd() media: bdisp: fix memleak on release media: radio: wl1273: fix interrupt masking on release cpuidle: Do not unset the driver if it is there already PM / devfreq: Lock devfreq in trans_stat_show ACPI: OSL: only free map once in osl.c ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() ACPI: PM: Avoid attaching ACPI PM domain to certain devices pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init pinctrl: samsung: Fix device node refcount leaks in init code mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card ppdev: fix PPGETTIME/PPSETTIME ioctls powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB video/hdmi: Fix AVI bar unpack quota: Check that quota is not dirty before release ext2: check err when partial != NULL quota: fix livelock in dquot_writeback_dquots scsi: zfcp: trace channel log even for FCP command responses usb: xhci: only set D3hot for pci device xhci: Fix memory leak in xhci_add_in_port() xhci: make sure interrupts are restored to correct state iio: adis16480: Add debugfs_reg_access entry Btrfs: fix negative subv_writers counter and data space leak after buffered write omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 scsi: lpfc: Cap NPIV vports to 256 e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk ath10k: fix fw crash by moving chip reset after napi disabled ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init scsi: qla2xxx: Fix DMA unmap leak scsi: qla2xxx: Fix session lookup in qlt_abort_work() scsi: qla2xxx: Fix qla24xx_process_bidir_cmd() scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value powerpc: Fix vDSO clock_getres() reiserfs: fix extended attributes on the root directory firmware: qcom: scm: Ensure 'a0' status code is treated as signed mm/shmem.c: cast the type of unmap_start to u64 ext4: fix a bug in ext4_wait_for_tail_page_commit blk-mq: make sure that line break can be printed workqueue: Fix missing kfree(rescuer) in destroy_workqueue() sunrpc: fix crash when cache_head become valid before update net/mlx5e: Fix SFF 8472 eeprom length kernel/module.c: wakeup processes in module_wq on module unload nvme: host: core: fix precedence of ternary operator net: bridge: deny dev_set_mac_address() when unregistering net: ethernet: ti: cpsw: fix extra rx interrupt openvswitch: support asymmetric conntrack tcp: md5: fix potential overestimation of TCP option space tipc: fix ordering of tipc module init and exit routine inet: protect against too small mtu values. tcp: fix rejected syncookies due to stale timestamps tcp: tighten acceptance of ACKs not matching a child socket tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() Revert "regulator: Defer init completion for a while after late_initcall" PCI: Fix Intel ACS quirk UPDCR register address PCI/MSI: Fix incorrect MSI-X masking on resume xtensa: fix TLB sanity checker CIFS: Respect O_SYNC and O_DIRECT flags during reconnect ARM: dts: s3c64xx: Fix init order of clock providers ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() vfio/pci: call irq_bypass_unregister_producer() before freeing irq dma-buf: Fix memory leak in sync_file_merge() dm btree: increase rebalance threshold in __rebalance2() scsi: iscsi: Fix a potential deadlock in the timeout handler drm/radeon: fix r1xx/r2xx register checker for POT textures xhci: fix USB3 device initiated resume race with roothub autosuspend net: stmmac: use correct DMA buffer size in the RX descriptor net: stmmac: don't stop NAPI processing when dropping a packet Linux 4.9.207 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
308 lines
7.4 KiB
C
308 lines
7.4 KiB
C
/*
|
|
* hdc100x.c - Support for the TI HDC100x temperature + humidity sensors
|
|
*
|
|
* Copyright (C) 2015 Matt Ranostay <mranostay@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/i2c.h>
|
|
|
|
#include <linux/iio/iio.h>
|
|
#include <linux/iio/sysfs.h>
|
|
|
|
#define HDC100X_REG_TEMP 0x00
|
|
#define HDC100X_REG_HUMIDITY 0x01
|
|
|
|
#define HDC100X_REG_CONFIG 0x02
|
|
#define HDC100X_REG_CONFIG_HEATER_EN BIT(13)
|
|
|
|
struct hdc100x_data {
|
|
struct i2c_client *client;
|
|
struct mutex lock;
|
|
u16 config;
|
|
|
|
/* integration time of the sensor */
|
|
int adc_int_us[2];
|
|
};
|
|
|
|
/* integration time in us */
|
|
static const int hdc100x_int_time[][3] = {
|
|
{ 6350, 3650, 0 }, /* IIO_TEMP channel*/
|
|
{ 6500, 3850, 2500 }, /* IIO_HUMIDITYRELATIVE channel */
|
|
};
|
|
|
|
/* HDC100X_REG_CONFIG shift and mask values */
|
|
static const struct {
|
|
int shift;
|
|
int mask;
|
|
} hdc100x_resolution_shift[2] = {
|
|
{ /* IIO_TEMP channel */
|
|
.shift = 10,
|
|
.mask = 1
|
|
},
|
|
{ /* IIO_HUMIDITYRELATIVE channel */
|
|
.shift = 8,
|
|
.mask = 3,
|
|
},
|
|
};
|
|
|
|
static IIO_CONST_ATTR(temp_integration_time_available,
|
|
"0.00365 0.00635");
|
|
|
|
static IIO_CONST_ATTR(humidityrelative_integration_time_available,
|
|
"0.0025 0.00385 0.0065");
|
|
|
|
static IIO_CONST_ATTR(out_current_heater_raw_available,
|
|
"0 1");
|
|
|
|
static struct attribute *hdc100x_attributes[] = {
|
|
&iio_const_attr_temp_integration_time_available.dev_attr.attr,
|
|
&iio_const_attr_humidityrelative_integration_time_available.dev_attr.attr,
|
|
&iio_const_attr_out_current_heater_raw_available.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static struct attribute_group hdc100x_attribute_group = {
|
|
.attrs = hdc100x_attributes,
|
|
};
|
|
|
|
static const struct iio_chan_spec hdc100x_channels[] = {
|
|
{
|
|
.type = IIO_TEMP,
|
|
.address = HDC100X_REG_TEMP,
|
|
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
|
|
BIT(IIO_CHAN_INFO_SCALE) |
|
|
BIT(IIO_CHAN_INFO_INT_TIME) |
|
|
BIT(IIO_CHAN_INFO_OFFSET),
|
|
},
|
|
{
|
|
.type = IIO_HUMIDITYRELATIVE,
|
|
.address = HDC100X_REG_HUMIDITY,
|
|
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
|
|
BIT(IIO_CHAN_INFO_SCALE) |
|
|
BIT(IIO_CHAN_INFO_INT_TIME)
|
|
},
|
|
{
|
|
.type = IIO_CURRENT,
|
|
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
|
.extend_name = "heater",
|
|
.output = 1,
|
|
},
|
|
};
|
|
|
|
static int hdc100x_update_config(struct hdc100x_data *data, int mask, int val)
|
|
{
|
|
int tmp = (~mask & data->config) | val;
|
|
int ret;
|
|
|
|
ret = i2c_smbus_write_word_swapped(data->client,
|
|
HDC100X_REG_CONFIG, tmp);
|
|
if (!ret)
|
|
data->config = tmp;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int hdc100x_set_it_time(struct hdc100x_data *data, int chan, int val2)
|
|
{
|
|
int shift = hdc100x_resolution_shift[chan].shift;
|
|
int ret = -EINVAL;
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(hdc100x_int_time[chan]); i++) {
|
|
if (val2 && val2 == hdc100x_int_time[chan][i]) {
|
|
ret = hdc100x_update_config(data,
|
|
hdc100x_resolution_shift[chan].mask << shift,
|
|
i << shift);
|
|
if (!ret)
|
|
data->adc_int_us[chan] = val2;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int hdc100x_get_measurement(struct hdc100x_data *data,
|
|
struct iio_chan_spec const *chan)
|
|
{
|
|
struct i2c_client *client = data->client;
|
|
int delay = data->adc_int_us[chan->address];
|
|
int ret;
|
|
__be16 val;
|
|
|
|
/* start measurement */
|
|
ret = i2c_smbus_write_byte(client, chan->address);
|
|
if (ret < 0) {
|
|
dev_err(&client->dev, "cannot start measurement");
|
|
return ret;
|
|
}
|
|
|
|
/* wait for integration time to pass */
|
|
usleep_range(delay, delay + 1000);
|
|
|
|
/* read measurement */
|
|
ret = i2c_master_recv(data->client, (char *)&val, sizeof(val));
|
|
if (ret < 0) {
|
|
dev_err(&client->dev, "cannot read sensor data\n");
|
|
return ret;
|
|
}
|
|
return be16_to_cpu(val);
|
|
}
|
|
|
|
static int hdc100x_get_heater_status(struct hdc100x_data *data)
|
|
{
|
|
return !!(data->config & HDC100X_REG_CONFIG_HEATER_EN);
|
|
}
|
|
|
|
static int hdc100x_read_raw(struct iio_dev *indio_dev,
|
|
struct iio_chan_spec const *chan, int *val,
|
|
int *val2, long mask)
|
|
{
|
|
struct hdc100x_data *data = iio_priv(indio_dev);
|
|
|
|
switch (mask) {
|
|
case IIO_CHAN_INFO_RAW: {
|
|
int ret;
|
|
|
|
mutex_lock(&data->lock);
|
|
if (chan->type == IIO_CURRENT) {
|
|
*val = hdc100x_get_heater_status(data);
|
|
ret = IIO_VAL_INT;
|
|
} else {
|
|
ret = hdc100x_get_measurement(data, chan);
|
|
if (ret >= 0) {
|
|
*val = ret;
|
|
ret = IIO_VAL_INT;
|
|
}
|
|
}
|
|
mutex_unlock(&data->lock);
|
|
return ret;
|
|
}
|
|
case IIO_CHAN_INFO_INT_TIME:
|
|
*val = 0;
|
|
*val2 = data->adc_int_us[chan->address];
|
|
return IIO_VAL_INT_PLUS_MICRO;
|
|
case IIO_CHAN_INFO_SCALE:
|
|
if (chan->type == IIO_TEMP) {
|
|
*val = 165000;
|
|
*val2 = 65536;
|
|
return IIO_VAL_FRACTIONAL;
|
|
} else {
|
|
*val = 100000;
|
|
*val2 = 65536;
|
|
return IIO_VAL_FRACTIONAL;
|
|
}
|
|
break;
|
|
case IIO_CHAN_INFO_OFFSET:
|
|
*val = -15887;
|
|
*val2 = 515151;
|
|
return IIO_VAL_INT_PLUS_MICRO;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
static int hdc100x_write_raw(struct iio_dev *indio_dev,
|
|
struct iio_chan_spec const *chan,
|
|
int val, int val2, long mask)
|
|
{
|
|
struct hdc100x_data *data = iio_priv(indio_dev);
|
|
int ret = -EINVAL;
|
|
|
|
switch (mask) {
|
|
case IIO_CHAN_INFO_INT_TIME:
|
|
if (val != 0)
|
|
return -EINVAL;
|
|
|
|
mutex_lock(&data->lock);
|
|
ret = hdc100x_set_it_time(data, chan->address, val2);
|
|
mutex_unlock(&data->lock);
|
|
return ret;
|
|
case IIO_CHAN_INFO_RAW:
|
|
if (chan->type != IIO_CURRENT || val2 != 0)
|
|
return -EINVAL;
|
|
|
|
mutex_lock(&data->lock);
|
|
ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_HEATER_EN,
|
|
val ? HDC100X_REG_CONFIG_HEATER_EN : 0);
|
|
mutex_unlock(&data->lock);
|
|
return ret;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
static const struct iio_info hdc100x_info = {
|
|
.read_raw = hdc100x_read_raw,
|
|
.write_raw = hdc100x_write_raw,
|
|
.attrs = &hdc100x_attribute_group,
|
|
.driver_module = THIS_MODULE,
|
|
};
|
|
|
|
static int hdc100x_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct iio_dev *indio_dev;
|
|
struct hdc100x_data *data;
|
|
|
|
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA |
|
|
I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C))
|
|
return -EOPNOTSUPP;
|
|
|
|
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
|
|
if (!indio_dev)
|
|
return -ENOMEM;
|
|
|
|
data = iio_priv(indio_dev);
|
|
i2c_set_clientdata(client, indio_dev);
|
|
data->client = client;
|
|
mutex_init(&data->lock);
|
|
|
|
indio_dev->dev.parent = &client->dev;
|
|
indio_dev->name = dev_name(&client->dev);
|
|
indio_dev->modes = INDIO_DIRECT_MODE;
|
|
indio_dev->info = &hdc100x_info;
|
|
|
|
indio_dev->channels = hdc100x_channels;
|
|
indio_dev->num_channels = ARRAY_SIZE(hdc100x_channels);
|
|
|
|
/* be sure we are in a known state */
|
|
hdc100x_set_it_time(data, 0, hdc100x_int_time[0][0]);
|
|
hdc100x_set_it_time(data, 1, hdc100x_int_time[1][0]);
|
|
|
|
return devm_iio_device_register(&client->dev, indio_dev);
|
|
}
|
|
|
|
static const struct i2c_device_id hdc100x_id[] = {
|
|
{ "hdc100x", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, hdc100x_id);
|
|
|
|
static struct i2c_driver hdc100x_driver = {
|
|
.driver = {
|
|
.name = "hdc100x",
|
|
},
|
|
.probe = hdc100x_probe,
|
|
.id_table = hdc100x_id,
|
|
};
|
|
module_i2c_driver(hdc100x_driver);
|
|
|
|
MODULE_AUTHOR("Matt Ranostay <mranostay@gmail.com>");
|
|
MODULE_DESCRIPTION("TI HDC100x humidity and temperature sensor driver");
|
|
MODULE_LICENSE("GPL");
|