diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-14 03:21:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-14 03:21:46 -0400 |
commit | 9bca19a01d50143b736f0f59eb3ccc05b1106172 (patch) | |
tree | 3321118b4a6bd4c949634bbdbb3d2c03454ae33b /include/linux/platform_data/i2c-gpio.h | |
parent | 463f202172c31b9c36278001cabfbad4e12da42e (diff) | |
parent | 53e39628ac228fada53cc0106be62c6f65f67501 (diff) |
Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang:
- mainly feature additions to drivers (stm32f7, qup, xlp9xx, mlxcpld, ...)
- conversion to use the i2c_8bit_addr_from_msg macro consistently
- move includes to platform_data
- core updates to allow the (still in review) I3C subsystem to connect
- and the regular share of smaller driver updates
* 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (68 commits)
i2c: qup: fix building without CONFIG_ACPI
i2c: tegra: Remove suspend-resume
i2c: imx-lpi2c: Switch to SPDX identifier
i2c: mxs: Switch to SPDX identifier
i2c: busses: make use of i2c_8bit_addr_from_msg
i2c: algos: make use of i2c_8bit_addr_from_msg
i2c: rcar: document R8A77980 bindings
i2c: qup: Add command-line parameter to override SCL frequency
i2c: qup: Correct duty cycle for FM and FM+
i2c: qup: Add support for Fast Mode Plus
i2c: qup: add probe path for Centriq ACPI devices
i2c: robotfuzz-osif: drop pointless test
i2c: robotfuzz-osif: remove pointless local variable
i2c: rk3x: Don't print visible virtual mapping MMIO address
i2c: opal: don't check number of messages in the driver
i2c: ibm_iic: don't check number of messages in the driver
i2c: imx: Switch to SPDX identifier
i2c: mux: pca954x: merge calls to of_match_device and of_device_get_match_data
i2c: mux: demux-pinctrl: use proper parent device for demux adapter
i2c: mux: improve error message for failed symlink
...
Diffstat (limited to 'include/linux/platform_data/i2c-gpio.h')
-rw-r--r-- | include/linux/platform_data/i2c-gpio.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/include/linux/platform_data/i2c-gpio.h b/include/linux/platform_data/i2c-gpio.h new file mode 100644 index 000000000000..352c1426fd4d --- /dev/null +++ b/include/linux/platform_data/i2c-gpio.h | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | * i2c-gpio interface to platform code | ||
3 | * | ||
4 | * Copyright (C) 2007 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef _LINUX_I2C_GPIO_H | ||
11 | #define _LINUX_I2C_GPIO_H | ||
12 | |||
13 | /** | ||
14 | * struct i2c_gpio_platform_data - Platform-dependent data for i2c-gpio | ||
15 | * @udelay: signal toggle delay. SCL frequency is (500 / udelay) kHz | ||
16 | * @timeout: clock stretching timeout in jiffies. If the slave keeps | ||
17 | * SCL low for longer than this, the transfer will time out. | ||
18 | * @sda_is_open_drain: SDA is configured as open drain, i.e. the pin | ||
19 | * isn't actively driven high when setting the output value high. | ||
20 | * gpio_get_value() must return the actual pin state even if the | ||
21 | * pin is configured as an output. | ||
22 | * @scl_is_open_drain: SCL is set up as open drain. Same requirements | ||
23 | * as for sda_is_open_drain apply. | ||
24 | * @scl_is_output_only: SCL output drivers cannot be turned off. | ||
25 | */ | ||
26 | struct i2c_gpio_platform_data { | ||
27 | int udelay; | ||
28 | int timeout; | ||
29 | unsigned int sda_is_open_drain:1; | ||
30 | unsigned int scl_is_open_drain:1; | ||
31 | unsigned int scl_is_output_only:1; | ||
32 | }; | ||
33 | |||
34 | #endif /* _LINUX_I2C_GPIO_H */ | ||