diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 12:09:17 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 12:09:17 +0000 |
| commit | 3a2ed314f30ba3a1cbcf4e87f409655ac17d5abc (patch) | |
| tree | ac3411bf0865991722824f06e942db4f7833bb70 /Documentation/devicetree/bindings/net/can | |
| parent | 3d99c47ffcad87e2d59b8ef6615d36b5d67dd76b (diff) | |
| parent | ec274ecd62f9e0404c935ff073346d243d5082e6 (diff) | |
Merge tag 'v5.4.82' into 5.4-2.3.x-imx
This is the 5.4.82 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'Documentation/devicetree/bindings/net/can')
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt index 27e1b4cebfbd..9cb3560756d0 100644 --- a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt +++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt @@ -33,7 +33,7 @@ tcan4x5x: tcan4x5x@0 { spi-max-frequency = <10000000>; bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>; interrupt-parent = <&gpio1>; - interrupts = <14 GPIO_ACTIVE_LOW>; + interrupts = <14 IRQ_TYPE_LEVEL_LOW>; device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; |