Commit ccbed9d8 authored by Sean Nyekjaer's avatar Sean Nyekjaer Committed by Jonathan Cameron
Browse files

iio: accel: fxls8962af: add padding to regmap for SPI 



Add missing don't care padding between address and
data for SPI transfers

Fixes: a3e0b518 ("iio: accel: add support for FXLS8962AF/FXLS8964AF accelerometers")
Signed-off-by: default avatarSean Nyekjaer <sean@geanix.com>
Link: https://lore.kernel.org/r/20211220125144.3630539-1-sean@geanix.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent b0e85f95

drivers/iio/accel/fxls8962af-core.c

+10 −2
Original line number Diff line number Diff line
@@ -173,12 +173,20 @@ struct fxls8962af_data { 
	u16 upper_thres;

};



const struct regmap_config fxls8962af_regmap_conf = {

const struct regmap_config fxls8962af_i2c_regmap_conf = {

	.reg_bits = 8,

	.val_bits = 8,

	.max_register = FXLS8962AF_MAX_REG,

};

EXPORT_SYMBOL_GPL(fxls8962af_regmap_conf);

EXPORT_SYMBOL_GPL(fxls8962af_i2c_regmap_conf);



const struct regmap_config fxls8962af_spi_regmap_conf = {

	.reg_bits = 8,

	.pad_bits = 8,

	.val_bits = 8,

	.max_register = FXLS8962AF_MAX_REG,

};

EXPORT_SYMBOL_GPL(fxls8962af_spi_regmap_conf);



enum {

	fxls8962af_idx_x,

drivers/iio/accel/fxls8962af-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int fxls8962af_probe(struct i2c_client *client) 
{

	struct regmap *regmap;



	regmap = devm_regmap_init_i2c(client, &fxls8962af_regmap_conf);

	regmap = devm_regmap_init_i2c(client, &fxls8962af_i2c_regmap_conf);

	if (IS_ERR(regmap)) {

		dev_err(&client->dev, "Failed to initialize i2c regmap\n");

		return PTR_ERR(regmap);

drivers/iio/accel/fxls8962af-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int fxls8962af_probe(struct spi_device *spi) 
{

	struct regmap *regmap;



	regmap = devm_regmap_init_spi(spi, &fxls8962af_regmap_conf);

	regmap = devm_regmap_init_spi(spi, &fxls8962af_spi_regmap_conf);

	if (IS_ERR(regmap)) {

		dev_err(&spi->dev, "Failed to initialize spi regmap\n");

		return PTR_ERR(regmap);

drivers/iio/accel/fxls8962af.h

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq); 
int fxls8962af_core_remove(struct device *dev);



extern const struct dev_pm_ops fxls8962af_pm_ops;

extern const struct regmap_config fxls8962af_regmap_conf;

extern const struct regmap_config fxls8962af_i2c_regmap_conf;

extern const struct regmap_config fxls8962af_spi_regmap_conf;



#endif				/* _FXLS8962AF_H_ */