Copy bme680 driver from linux-stable v4.20-rc1

linux_kernel_modules/bme680/bitfield.h

-/*
- * Copyright (C) 2014 Felix Fietkau <nbd@nbd.name>
- * Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation
- *
- * 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 _LINUX_BITFIELD_H
-#define _LINUX_BITFIELD_H
-
-#include <asm/byteorder.h>
-
-/*
- * Bitfield access macros
- *
- * FIELD_{GET,PREP} macros take as first parameter shifted mask
- * from which they extract the base mask and shift amount.
- * Mask must be a compilation time constant.
- *
- * Example:
- *
- *  #define REG_FIELD_A  GENMASK(6, 0)
- *  #define REG_FIELD_B  BIT(7)
- *  #define REG_FIELD_C  GENMASK(15, 8)
- *  #define REG_FIELD_D  GENMASK(31, 16)
- *
- * Get:
- *  a = FIELD_GET(REG_FIELD_A, reg);
- *  b = FIELD_GET(REG_FIELD_B, reg);
- *
- * Set:
- *  reg = FIELD_PREP(REG_FIELD_A, 1) |
- *	  FIELD_PREP(REG_FIELD_B, 0) |
- *	  FIELD_PREP(REG_FIELD_C, c) |
- *	  FIELD_PREP(REG_FIELD_D, 0x40);
- *
- * Modify:
- *  reg &= ~REG_FIELD_C;
- *  reg |= FIELD_PREP(REG_FIELD_C, c);
- */
-
-#define __bf_shf(x) (__builtin_ffsll(x) - 1)
-
-/**
- * FIELD_PREP() - prepare a bitfield element
- * @_mask: shifted mask defining the field's length and position
- * @_val:  value to put in the field
- *
- * FIELD_PREP() masks and shifts up the value.  The result should
- * be combined with other fields of the bitfield using logical OR.
- */
-#define FIELD_PREP(_mask, _val)						\
-	({								\
-		((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask);	\
-	})
-#endif

linux_kernel_modules/bme680/bme680-i2c.mdef

-cflags:
-{
-    // This driver depends on IIO
-    -DCONFIG_IIO
-    -DCONFIG_IIO_BUFFER
-    -DCONFIG_IIO_TRIGGERRED_BUFFER
-    -DDEBUG
-    -DREGMAP
-    -DREGMAP_I2C
-}
-
-sources:
-{
-    bme680_i2c.c
-    bme680_core.c
-}
-
-requires:
-{
-    kernelModules:
-    {
-#if ${MANGOH_KERNEL_LACKS_IIO} = 1
-        $CURDIR/../iio/iio
-#endif // MANGOH_KERNEL_LACKS_IIO
-    }
-}

linux_kernel_modules/bme680/bme680.h

@@ -4,10 +4,10 @@
 
 #define BME680_REG_CHIP_I2C_ID			0xD0
 #define BME680_REG_CHIP_SPI_ID			0x50
-#define BME680_CHIP_ID_VAL			0x61
+#define   BME680_CHIP_ID_VAL			0x61
 #define BME680_REG_SOFT_RESET_I2C		0xE0
 #define BME680_REG_SOFT_RESET_SPI		0x60
-#define BME680_CMD_SOFTRESET			0xB6
+#define   BME680_CMD_SOFTRESET			0xB6
 #define BME680_REG_STATUS			0x73
 #define   BME680_SPI_MEM_PAGE_BIT		BIT(4)
 #define     BME680_SPI_MEM_PAGE_1_VAL		1
@@ -18,6 +18,7 @@
 #define BME680_REG_GAS_MSB			0x2A
 #define BME680_REG_GAS_R_LSB			0x2B
 #define   BME680_GAS_STAB_BIT			BIT(4)
+#define   BME680_GAS_RANGE_MASK			GENMASK(3, 0)
 
 #define BME680_REG_CTRL_HUMIDITY		0x72
 #define   BME680_OSRS_HUMIDITY_MASK		GENMASK(2, 0)
@@ -26,9 +27,8 @@
 #define   BME680_OSRS_TEMP_MASK			GENMASK(7, 5)
 #define   BME680_OSRS_PRESS_MASK		GENMASK(4, 2)
 #define   BME680_MODE_MASK			GENMASK(1, 0)
-
-#define BME680_MODE_FORCED			1
-#define BME680_MODE_SLEEP			0
+#define     BME680_MODE_FORCED			1
+#define     BME680_MODE_SLEEP			0
 
 #define BME680_REG_CONFIG			0x75
 #define   BME680_FILTER_MASK			GENMASK(4, 2)
@@ -39,24 +39,21 @@
 
 #define BME680_MAX_OVERFLOW_VAL			0x40000000
 #define BME680_HUM_REG_SHIFT_VAL		4
-#define BME680_BIT_H1_DATA_MSK			0x0F
+#define BME680_BIT_H1_DATA_MASK			GENMASK(3, 0)
 
 #define BME680_REG_RES_HEAT_RANGE		0x02
-#define BME680_RHRANGE_MSK			0x30
+#define   BME680_RHRANGE_MASK			GENMASK(5, 4)
 #define BME680_REG_RES_HEAT_VAL			0x00
 #define BME680_REG_RANGE_SW_ERR			0x04
-#define BME680_RSERROR_MSK			0xF0
+#define   BME680_RSERROR_MASK			GENMASK(7, 4)
 #define BME680_REG_RES_HEAT_0			0x5A
 #define BME680_REG_GAS_WAIT_0			0x64
-#define BME680_GAS_RANGE_MASK			0x0F
 #define BME680_ADC_GAS_RES_SHIFT		6
 #define BME680_AMB_TEMP				25
 
 #define BME680_REG_CTRL_GAS_1			0x71
 #define   BME680_RUN_GAS_MASK			BIT(4)
 #define   BME680_NB_CONV_MASK			GENMASK(3, 0)
-#define     BME680_RUN_GAS_EN_BIT		BIT(4)
-#define     BME680_NB_CONV_0_VAL		0
 
 #define BME680_REG_MEAS_STAT_0			0x1D
 #define   BME680_GAS_MEAS_BIT			BIT(6)