summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2024-07-20 15:42:18 +0200
committerWolfram Sang <wsa+renesas@sang-engineering.com>2024-07-20 15:42:18 +0200
commit6318f219cd8971296c04371b2dc4a0bff7f44858 (patch)
treef1c10cf3a5fcb0cb827466f39e892a211f125504 /include
parent8e5c0abfa02d85b9cd2419567ad2d73ed8fe4b74 (diff)
parentde4f2f52f93257433c9029ba2b4044cd9f029b21 (diff)
downloadlinux-6318f219cd8971296c04371b2dc4a0bff7f44858.tar.gz
linux-6318f219cd8971296c04371b2dc4a0bff7f44858.tar.bz2
linux-6318f219cd8971296c04371b2dc4a0bff7f44858.zip
Merge tag 'i2c-host-6.11-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow
Added descriptions in the DTS for the Qualcomm SM8650 and SM8550 Camera Control Interface (CCI). Added support for the "settle-time-us" property, which allows the gpio-mux device to switch from one bus to another with a configurable delay. The time can be set in the DTS. The latest change also includes file sorting. Fixed slot numbering in the SMBus framework to prevent failures when more than 8 slots are occupied. It now enforces a a maximum of 8 slots to be used. This ensures that the Intel PIIX4 device can register the SPDs correctly without failure, even if other slots are populated but not used.
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/i2c-mux-gpio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/i2c-mux-gpio.h b/include/linux/platform_data/i2c-mux-gpio.h
index 816a4cd3ccb5..96843aab4d1e 100644
--- a/include/linux/platform_data/i2c-mux-gpio.h
+++ b/include/linux/platform_data/i2c-mux-gpio.h
@@ -19,6 +19,7 @@
* position
* @n_values: Number of multiplexer positions (busses to instantiate)
* @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used
+ * @settle_time: Delay to wait when a new bus is selected
*/
struct i2c_mux_gpio_platform_data {
int parent;
@@ -26,6 +27,7 @@ struct i2c_mux_gpio_platform_data {
const unsigned *values;
int n_values;
unsigned idle;
+ u32 settle_time;
};
#endif /* _LINUX_I2C_MUX_GPIO_H */