summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2020-03-30 07:34:14 +0100
committerLee Jones <lee.jones@linaro.org>2020-03-30 07:34:14 +0100
commit873357b1a7f044888be0a1dc6a753376cd2140eb (patch)
tree207c79fd9b865e25fcf1a64fb42093ab29a1a221 /Documentation
parent189c3c495ad7382099a641664171d8b047d9e9b5 (diff)
parent7858658cdcab7ca8057444b1d24c6a28ddaa8589 (diff)
downloadlinux-stable-873357b1a7f044888be0a1dc6a753376cd2140eb.tar.gz
linux-stable-873357b1a7f044888be0a1dc6a753376cd2140eb.tar.bz2
linux-stable-873357b1a7f044888be0a1dc6a753376cd2140eb.zip
Merge branches 'ib-mfd-iio-input-5.7' and 'ib-mfd-iio-rtc-5.7' into ibs-for-mfd-merged
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mfd/rn5t618.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/rn5t618.txt b/Documentation/devicetree/bindings/mfd/rn5t618.txt
index b74e5e94d1cb..16778ea00dbc 100644
--- a/Documentation/devicetree/bindings/mfd/rn5t618.txt
+++ b/Documentation/devicetree/bindings/mfd/rn5t618.txt
@@ -15,6 +15,8 @@ Required properties:
- reg: the I2C slave address of the device
Optional properties:
+ - interrupts: interrupt mapping for IRQ
+ See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
- system-power-controller:
See Documentation/devicetree/bindings/power/power-controller.txt
@@ -32,6 +34,8 @@ Example:
pmic@32 {
compatible = "ricoh,rn5t618";
reg = <0x32>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
system-power-controller;
regulators {