projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
i2c
/
sx150x.h
diff --git
a/include/linux/i2c/sx150x.h
b/include/linux/i2c/sx150x.h
index ee3049cb9ba5782e27447d3984a914a2d39ae87b..52baa79d69a763f7f94f728b115fe0337190addd 100644
(file)
--- a/
include/linux/i2c/sx150x.h
+++ b/
include/linux/i2c/sx150x.h
@@
-63,6
+63,9
@@
* IRQ lines will appear. Similarly to gpio_base, the expander
* will create a block of irqs beginning at this number.
* This value is ignored if irq_summary is < 0.
* IRQ lines will appear. Similarly to gpio_base, the expander
* will create a block of irqs beginning at this number.
* This value is ignored if irq_summary is < 0.
+ * @reset_during_probe: If set to true, the driver will trigger a full
+ * reset of the chip at the beginning of the probe
+ * in order to place it in a known state.
*/
struct sx150x_platform_data {
unsigned gpio_base;
*/
struct sx150x_platform_data {
unsigned gpio_base;
@@
-73,6
+76,7
@@
struct sx150x_platform_data {
u16 io_polarity;
int irq_summary;
unsigned irq_base;
u16 io_polarity;
int irq_summary;
unsigned irq_base;
+ bool reset_during_probe;
};
#endif /* __LINUX_I2C_SX150X_H */
};
#endif /* __LINUX_I2C_SX150X_H */