Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-08-15 20:23:23 -07:00
parent 22cb7a3ac3 510c8a899c
commit 463910e2df
228 changed files with 2158 additions and 908 deletions
--- a/include/linux/platform_data/st_sensors_pdata.h
+++ b/include/linux/platform_data/st_sensors_pdata.h
@@ -17,10 +17,12 @@
 *	Available only for accelerometer and pressure sensors.
 *	Accelerometer DRDY on LSM330 available only on pin 1 (see datasheet).
 * @open_drain: set the interrupt line to be open drain if possible.
+ * @spi_3wire: enable spi-3wire mode.
 */
 struct st_sensors_platform_data {
 	u8 drdy_int_pin;
 	bool open_drain;
+	bool spi_3wire;
 };

 #endif /* ST_SENSORS_PDATA_H */