Commit b03e0816 authored by Maxime Ripard's avatar Maxime Ripard

ARM: sunxi: dt: Convert users to the PIO interrupts binding

The current DTs were setting the cell size to 2, but used the default xlate
function that was assuming an interrupt cell size of 1, leading to the
second part of the cell (the flags) being ignored, while we were having an
inconsistent binding between the interrupts and gpio (that could also be
used as interrupts).

That "binding" doesn't work either with newer SoCs that have multiple irq
banks.

Now that we fixed the pinctrl driver to handle this like it should always
have been handled, convert the DT users, and while we're at it, remove the
size-cells property of PIO that is completely useless.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 79ae3e66
...@@ -726,8 +726,7 @@ pio: pinctrl@01c20800 { ...@@ -726,8 +726,7 @@ pio: pinctrl@01c20800 {
clocks = <&apb0_gates 5>; clocks = <&apb0_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <3>;
#size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
pwm0_pins_a: pwm0@0 { pwm0_pins_a: pwm0@0 {
......
...@@ -93,7 +93,7 @@ icn8318: touchscreen@40 { ...@@ -93,7 +93,7 @@ icn8318: touchscreen@40 {
compatible = "chipone,icn8318"; compatible = "chipone,icn8318";
reg = <0x40>; reg = <0x40>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */ interrupts = <6 9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ts_wake_pin_p66>; pinctrl-0 = <&ts_wake_pin_p66>;
wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
......
...@@ -488,8 +488,7 @@ pio: pinctrl@01c20800 { ...@@ -488,8 +488,7 @@ pio: pinctrl@01c20800 {
clocks = <&apb0_gates 5>; clocks = <&apb0_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <3>;
#size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
i2c0_pins_a: i2c0@0 { i2c0_pins_a: i2c0@0 {
......
...@@ -612,8 +612,7 @@ pio: pinctrl@01c20800 { ...@@ -612,8 +612,7 @@ pio: pinctrl@01c20800 {
clocks = <&apb1_gates 5>; clocks = <&apb1_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <3>;
#size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
uart0_pins_a: uart0@0 { uart0_pins_a: uart0@0 {
......
...@@ -181,7 +181,7 @@ brcmf: bcrmf@1 { ...@@ -181,7 +181,7 @@ brcmf: bcrmf@1 {
reg = <1>; reg = <1>;
compatible = "brcm,bcm4329-fmac"; compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */ interrupts = <7 10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */
interrupt-names = "host-wake"; interrupt-names = "host-wake";
}; };
}; };
......
...@@ -178,7 +178,7 @@ brcmf: bcrmf@1 { ...@@ -178,7 +178,7 @@ brcmf: bcrmf@1 {
reg = <1>; reg = <1>;
compatible = "brcm,bcm4329-fmac"; compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */ interrupts = <7 10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */
interrupt-names = "host-wake"; interrupt-names = "host-wake";
}; };
}; };
......
...@@ -807,8 +807,7 @@ pio: pinctrl@01c20800 { ...@@ -807,8 +807,7 @@ pio: pinctrl@01c20800 {
clocks = <&apb0_gates 5>; clocks = <&apb0_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <3>;
#size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
pwm0_pins_a: pwm0@0 { pwm0_pins_a: pwm0@0 {
......
...@@ -361,8 +361,7 @@ pio: pinctrl@01c20800 { ...@@ -361,8 +361,7 @@ pio: pinctrl@01c20800 {
clocks = <&apb1_gates 5>; clocks = <&apb1_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#address-cells = <1>; #interrupt-cells = <3>;
#size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
uart0_pins_a: uart0@0 { uart0_pins_a: uart0@0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment