mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
73f3bc6da5
The SPI interface implementation was completely broken.
When using the SPI interface, there are only 7 address bits, the upper bit
is controlled by a page select register. The core needs access to both
ranges, so implement register read/write for both regions. The regmap
paging functionality didn't agree with a register that needs to be read
and modified, so I implemented a custom paging algorithm.
This fixes that the device wouldn't even probe in SPI mode.
The SPI interface then isn't different from I2C, merged them into the core,
and the I2C/SPI named registers are no longer needed.
Implemented register value caching for the registers to reduce the I2C/SPI
data transfers considerably.
The calibration set reads as all zeroes until some undefined point in time,
and I couldn't determine what makes it valid. The datasheet mentions these
registers but does not provide any hints on when they become valid, and they
aren't even enumerated in the memory map. So check the calibration and
retry reading it from the device after each measurement until it provides
something valid.
Despite the size this is suitable for a stable backport given that
it seems the SPI support never worked.
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Fixes: 1b3bd85927 ("iio: chemical: Add support for Bosch BME680 sensor");
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
71 lines
1.7 KiB
C
71 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* BME680 - I2C Driver
|
|
*
|
|
* Copyright (C) 2018 Himanshu Jha <himanshujha199640@gmail.com>
|
|
*
|
|
* 7-Bit I2C slave address is:
|
|
* - 0x76 if SDO is pulled to GND
|
|
* - 0x77 if SDO is pulled to VDDIO
|
|
*
|
|
* Note: SDO pin cannot be left floating otherwise I2C address
|
|
* will be undefined.
|
|
*/
|
|
#include <linux/acpi.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/module.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#include "bme680.h"
|
|
|
|
static int bme680_i2c_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct regmap *regmap;
|
|
const char *name = NULL;
|
|
|
|
regmap = devm_regmap_init_i2c(client, &bme680_regmap_config);
|
|
if (IS_ERR(regmap)) {
|
|
dev_err(&client->dev, "Failed to register i2c regmap %d\n",
|
|
(int)PTR_ERR(regmap));
|
|
return PTR_ERR(regmap);
|
|
}
|
|
|
|
if (id)
|
|
name = id->name;
|
|
|
|
return bme680_core_probe(&client->dev, regmap, name);
|
|
}
|
|
|
|
static const struct i2c_device_id bme680_i2c_id[] = {
|
|
{"bme680", 0},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, bme680_i2c_id);
|
|
|
|
static const struct acpi_device_id bme680_acpi_match[] = {
|
|
{"BME0680", 0},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, bme680_acpi_match);
|
|
|
|
static const struct of_device_id bme680_of_i2c_match[] = {
|
|
{ .compatible = "bosch,bme680", },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, bme680_of_i2c_match);
|
|
|
|
static struct i2c_driver bme680_i2c_driver = {
|
|
.driver = {
|
|
.name = "bme680_i2c",
|
|
.acpi_match_table = ACPI_PTR(bme680_acpi_match),
|
|
.of_match_table = bme680_of_i2c_match,
|
|
},
|
|
.probe = bme680_i2c_probe,
|
|
.id_table = bme680_i2c_id,
|
|
};
|
|
module_i2c_driver(bme680_i2c_driver);
|
|
|
|
MODULE_AUTHOR("Himanshu Jha <himanshujha199640@gmail.com>");
|
|
MODULE_DESCRIPTION("BME680 I2C driver");
|
|
MODULE_LICENSE("GPL v2");
|