02e2af20f4
Here is the big set of char/misc and other small driver subsystem updates for 5.18-rc1. Included in here are merges from driver subsystems which contain: - iio driver updates and new drivers - fsi driver updates - fpga driver updates - habanalabs driver updates and support for new hardware - soundwire driver updates and new drivers - phy driver updates and new drivers - coresight driver updates - icc driver updates Individual changes include: - mei driver updates - interconnect driver updates - new PECI driver subsystem added - vmci driver updates - lots of tiny misc/char driver updates There will be two merge conflicts with your tree, one in MAINTAINERS which is obvious to fix up, and one in drivers/phy/freescale/Kconfig which also should be easy to resolve. All of these have been in linux-next for a while with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCYkG3fQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ykNEgCfaRG8CRxewDXOO4+GSeA3NGK+AIoAnR89donC R4bgCjfg8BWIBcVVXg3/ =WWXC -----END PGP SIGNATURE----- Merge tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc and other driver updates from Greg KH: "Here is the big set of char/misc and other small driver subsystem updates for 5.18-rc1. Included in here are merges from driver subsystems which contain: - iio driver updates and new drivers - fsi driver updates - fpga driver updates - habanalabs driver updates and support for new hardware - soundwire driver updates and new drivers - phy driver updates and new drivers - coresight driver updates - icc driver updates Individual changes include: - mei driver updates - interconnect driver updates - new PECI driver subsystem added - vmci driver updates - lots of tiny misc/char driver updates All of these have been in linux-next for a while with no reported problems" * tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (556 commits) firmware: google: Properly state IOMEM dependency kgdbts: fix return value of __setup handler firmware: sysfb: fix platform-device leak in error path firmware: stratix10-svc: add missing callback parameter on RSU arm64: dts: qcom: add non-secure domain property to fastrpc nodes misc: fastrpc: Add dma handle implementation misc: fastrpc: Add fdlist implementation misc: fastrpc: Add helper function to get list and page misc: fastrpc: Add support to secure memory map dt-bindings: misc: add fastrpc domain vmid property misc: fastrpc: check before loading process to the DSP misc: fastrpc: add secure domain support dt-bindings: misc: add property to support non-secure DSP misc: fastrpc: Add support to get DSP capabilities misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP misc: fastrpc: separate fastrpc device from channel context dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells dt-bindings: nvmem: make "reg" property optional nvmem: brcm_nvram: parse NVRAM content into NVMEM cells nvmem: dt-bindings: Fix the error of dt-bindings check ...
144 lines
3.2 KiB
C
144 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* MS5611 pressure and temperature sensor driver (SPI bus)
|
|
*
|
|
* Copyright (c) Tomasz Duszynski <tduszyns@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/module.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/mod_devicetable.h>
|
|
|
|
#include <asm/unaligned.h>
|
|
|
|
#include "ms5611.h"
|
|
|
|
static int ms5611_spi_reset(struct ms5611_state *st)
|
|
{
|
|
u8 cmd = MS5611_RESET;
|
|
|
|
return spi_write_then_read(st->client, &cmd, 1, NULL, 0);
|
|
}
|
|
|
|
static int ms5611_spi_read_prom_word(struct ms5611_state *st, int index,
|
|
u16 *word)
|
|
{
|
|
int ret;
|
|
|
|
ret = spi_w8r16be(st->client, MS5611_READ_PROM_WORD + (index << 1));
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
*word = ret;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ms5611_spi_read_adc(struct ms5611_state *st, s32 *val)
|
|
{
|
|
int ret;
|
|
u8 buf[3] = { MS5611_READ_ADC };
|
|
|
|
ret = spi_write_then_read(st->client, buf, 1, buf, 3);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
*val = get_unaligned_be24(&buf[0]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ms5611_spi_read_adc_temp_and_pressure(struct ms5611_state *st,
|
|
s32 *temp, s32 *pressure)
|
|
{
|
|
int ret;
|
|
const struct ms5611_osr *osr = st->temp_osr;
|
|
|
|
/*
|
|
* Warning: &osr->cmd MUST be aligned on a word boundary since used as
|
|
* 2nd argument (void*) of spi_write_then_read.
|
|
*/
|
|
ret = spi_write_then_read(st->client, &osr->cmd, 1, NULL, 0);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL));
|
|
ret = ms5611_spi_read_adc(st, temp);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
osr = st->pressure_osr;
|
|
ret = spi_write_then_read(st->client, &osr->cmd, 1, NULL, 0);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL));
|
|
return ms5611_spi_read_adc(st, pressure);
|
|
}
|
|
|
|
static int ms5611_spi_probe(struct spi_device *spi)
|
|
{
|
|
int ret;
|
|
struct ms5611_state *st;
|
|
struct iio_dev *indio_dev;
|
|
|
|
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
|
if (!indio_dev)
|
|
return -ENOMEM;
|
|
|
|
spi_set_drvdata(spi, indio_dev);
|
|
|
|
spi->mode = SPI_MODE_0;
|
|
spi->max_speed_hz = 20000000;
|
|
spi->bits_per_word = 8;
|
|
ret = spi_setup(spi);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
st = iio_priv(indio_dev);
|
|
st->reset = ms5611_spi_reset;
|
|
st->read_prom_word = ms5611_spi_read_prom_word;
|
|
st->read_adc_temp_and_pressure = ms5611_spi_read_adc_temp_and_pressure;
|
|
st->client = spi;
|
|
|
|
return ms5611_probe(indio_dev, &spi->dev, spi_get_device_id(spi)->name,
|
|
spi_get_device_id(spi)->driver_data);
|
|
}
|
|
|
|
static void ms5611_spi_remove(struct spi_device *spi)
|
|
{
|
|
ms5611_remove(spi_get_drvdata(spi));
|
|
}
|
|
|
|
static const struct of_device_id ms5611_spi_matches[] = {
|
|
{ .compatible = "meas,ms5611" },
|
|
{ .compatible = "meas,ms5607" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ms5611_spi_matches);
|
|
|
|
static const struct spi_device_id ms5611_id[] = {
|
|
{ "ms5611", MS5611 },
|
|
{ "ms5607", MS5607 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, ms5611_id);
|
|
|
|
static struct spi_driver ms5611_driver = {
|
|
.driver = {
|
|
.name = "ms5611",
|
|
.of_match_table = ms5611_spi_matches
|
|
},
|
|
.id_table = ms5611_id,
|
|
.probe = ms5611_spi_probe,
|
|
.remove = ms5611_spi_remove,
|
|
};
|
|
module_spi_driver(ms5611_driver);
|
|
|
|
MODULE_AUTHOR("Tomasz Duszynski <tduszyns@gmail.com>");
|
|
MODULE_DESCRIPTION("MS5611 spi driver");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_IMPORT_NS(IIO_MS5611);
|