diff options
author | Tejun Heo <tj@kernel.org> | 2018-12-27 18:05:30 -0800 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2018-12-27 18:05:30 -0800 |
commit | 4d71c6f8771a6bccb844244f09831fa4624b22c1 (patch) | |
tree | 9c6fdf753d64c839a4b0deb7d35d7e990c8e9971 /Documentation/devicetree/bindings/net/can/holt_hi311x.txt | |
parent | 1e7eacaf1db2f0f5f62fceda4e6c5a8869f00c13 (diff) | |
parent | e9d81a1bc2c48ea9782e3e8b53875f419766ef47 (diff) | |
download | blackbird-obmc-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.gz blackbird-obmc-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.zip |
Merge branch 'for-4.20-fixes' into for-4.21
Diffstat (limited to 'Documentation/devicetree/bindings/net/can/holt_hi311x.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/can/holt_hi311x.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/can/holt_hi311x.txt b/Documentation/devicetree/bindings/net/can/holt_hi311x.txt index 903a78da65be..3a9926f99937 100644 --- a/Documentation/devicetree/bindings/net/can/holt_hi311x.txt +++ b/Documentation/devicetree/bindings/net/can/holt_hi311x.txt @@ -17,7 +17,7 @@ Example: reg = <1>; clocks = <&clk32m>; interrupt-parent = <&gpio4>; - interrupts = <13 IRQ_TYPE_EDGE_RISING>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; vdd-supply = <®5v0>; xceiver-supply = <®5v0>; }; |