Skip to contentSkip to conversation

dt-bindings: mfd: correct interrupt flags in examples

PATCH Applied Krzysztof Kozlowski 2 participants 4 messages Sep 17, 2020 – Sep 29, 2020

Subsystems (2)
Device tree bindings Multifunction devices (MFD)
lore
Share & tools
lore

Krzysztof Kozlowski

author
#0 lore raw

PATCH v2 1/1 dt-bindings: mfd: correct interrupt flags in examples

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

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by Matti Vaittinen <[email protected]> # for BD70528
Acked-by Tim Harvey <[email protected]> # for gateworks-gsc.yaml
Acked-by Rob Herring <[email protected]>

---

Changes since v1:
1. Add acks

---
 Documentation/devicetree/bindings/mfd/act8945a.txt          | 2 +-
 Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml    | 3 ++-
 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/mfd/act8945a.txt +1 -1
index e6f168db6c72..5ca75d888b4a 100644
@@ -71,7 +71,7 @@ Example:
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
 			interrupt-parent = <&pioA>;
-			interrupts = <45 GPIO_ACTIVE_LOW>;
+			interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
 
 			active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
 			active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml +2 -1
index 9b6eb50606e8..e541eb0d02ed 100644
@@ -147,6 +147,7 @@ required:
 examples:
   - |
     #include <dt-bindings/gpio/gpio.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
     i2c {
         #address-cells = <1>;
         #size-cells = <0>;

@@ -155,7 +156,7 @@ examples:
             compatible = "gw,gsc";
             reg = <0x20>;
             interrupt-parent = <&gpio1>;
-            interrupts = <4 GPIO_ACTIVE_LOW>;
+            interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
             interrupt-controller;
             #interrupt-cells = <1>;
             #address-cells = <1>;
Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt +1 -1
index c3c02ce73cde..386eec06cf08 100644
@@ -39,7 +39,7 @@ pmic: pmic@4b {
 	compatible = "rohm,bd70528";
 	reg = <0x4b>;
 	interrupt-parent = <&gpio1>;
-	interrupts = <29 GPIO_ACTIVE_LOW>;
+	interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
 	clocks = <&osc 0>;
 	#clock-cells = <0>;
 	clock-output-names = "bd70528-32k-out";
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 17 lines · Krzysztof Kozlowski

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

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by Matti Vaittinen <[email protected]> # for BD70528
Acked-by Tim Harvey <[email protected]> # for gateworks-gsc.yaml
Acked-by Rob Herring <[email protected]>

---

Quoted 7 lines

Changes since v1:
1. Add acks

---
 Documentation/devicetree/bindings/mfd/act8945a.txt          | 2 +-
 Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml    | 3 ++-
 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw
In reply to Krzysztof Kozlowski
Quoted 15 lines · Krzysztof Kozlowski

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

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by Matti Vaittinen <[email protected]> # for BD70528
Acked-by Tim Harvey <[email protected]> # for gateworks-gsc.yaml
Acked-by Rob Herring <[email protected]>
Quoted 4 lines

---

Changes since v1:
1. Add acks

FYI, this should not bump the patch version.

Quoted 5 lines
---
 Documentation/devicetree/bindings/mfd/act8945a.txt          | 2 +-
 Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml    | 3 ++-
 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#3 lore raw
Quoted 17 lines · Lee Jones
Quoted 15 lines · Krzysztof Kozlowski

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

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by Matti Vaittinen <[email protected]> # for BD70528
Acked-by Tim Harvey <[email protected]> # for gateworks-gsc.yaml
Acked-by Rob Herring <[email protected]>
Quoted 6 lines
Quoted 4 lines

---

Changes since v1:
1. Add acks

FYI, this should not bump the patch version.

Yes, that was my mistake. I kept this one with multiple other similar patches and was updating all of them.... but I sent each group independently at the end so this one did not receive any updates actually.

Best regards,
Krzysztof