| Message ID | 20201026153620.89268-1-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND,v2] dt-bindings: net: correct interrupt flags in examples | expand |
On Fri, 27 Nov 2020 10:13:01 +0100 Marc Kleine-Budde wrote: > On 10/26/20 4:36 PM, Krzysztof Kozlowski wrote: > > GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. > > These are simple defines so they could be used in DTS but they will not > > have the same meaning: > > 1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE > > 2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING > > > > Correct the interrupt flags, assuming the author of the code wanted same > > logical behavior behind the name "ACTIVE_xxx", this is: > > ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW > > ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > Acked-by: Rob Herring <robh@kernel.org> > > Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for tcan4x5x.txt > > Jakub, can you queue this patch for net/master? Sure! Are these correct? Fixes: a1a8b4594f8d ("NFC: pn544: i2c: Add DTS Documentation") Fixes: 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver") Fixes: e3b329221567 ("dt-bindings: can: tcan4x5x: Update binding to use interrupt property")
On 11/27/20 5:27 PM, Jakub Kicinski wrote: > On Fri, 27 Nov 2020 10:13:01 +0100 Marc Kleine-Budde wrote: >> On 10/26/20 4:36 PM, Krzysztof Kozlowski wrote: >>> GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. >>> These are simple defines so they could be used in DTS but they will not >>> have the same meaning: >>> 1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE >>> 2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING >>> >>> Correct the interrupt flags, assuming the author of the code wanted same >>> logical behavior behind the name "ACTIVE_xxx", this is: >>> ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW >>> ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH >>> >>> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> >>> Acked-by: Rob Herring <robh@kernel.org> >>> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for tcan4x5x.txt >> >> Jakub, can you queue this patch for net/master? > > Sure! Are these correct? > > Fixes: a1a8b4594f8d ("NFC: pn544: i2c: Add DTS Documentation") > Fixes: 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver") ACK: > Fixes: e3b329221567 ("dt-bindings: can: tcan4x5x: Update binding to use interrupt property") Marc
On Fri, 27 Nov 2020 20:35:55 +0100 Marc Kleine-Budde wrote: > On 11/27/20 5:27 PM, Jakub Kicinski wrote: > > On Fri, 27 Nov 2020 10:13:01 +0100 Marc Kleine-Budde wrote: > >> On 10/26/20 4:36 PM, Krzysztof Kozlowski wrote: > >>> GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. > >>> These are simple defines so they could be used in DTS but they will not > >>> have the same meaning: > >>> 1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE > >>> 2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING > >>> > >>> Correct the interrupt flags, assuming the author of the code wanted same > >>> logical behavior behind the name "ACTIVE_xxx", this is: > >>> ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW > >>> ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH > >>> > >>> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > >>> Acked-by: Rob Herring <robh@kernel.org> > >>> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for tcan4x5x.txt > >> > >> Jakub, can you queue this patch for net/master? > > > > Sure! Are these correct? > > > > Fixes: a1a8b4594f8d ("NFC: pn544: i2c: Add DTS Documentation") > > Fixes: 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver") > > ACK: Applied to net and queued for stable, thanks!
diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt index 3613c2c8f75d..0968b40aef1e 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_HIGH>; diff --git a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt index cfaf88998918..9e4dc510a40a 100644 --- a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt +++ b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt @@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2): clock-frequency = <100000>; interrupt-parent = <&gpio1>; - interrupts = <29 GPIO_ACTIVE_HIGH>; + interrupts = <29 IRQ_TYPE_LEVEL_HIGH>; enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; diff --git a/Documentation/devicetree/bindings/net/nfc/pn544.txt b/Documentation/devicetree/bindings/net/nfc/pn544.txt index 92f399ec22b8..2bd82562ce8e 100644 --- a/Documentation/devicetree/bindings/net/nfc/pn544.txt +++ b/Documentation/devicetree/bindings/net/nfc/pn544.txt @@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2): clock-frequency = <400000>; interrupt-parent = <&gpio1>; - interrupts = <17 GPIO_ACTIVE_HIGH>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>; enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;