Skip to content

Commit

Permalink
ARM: sunxi: DT: Convert the DTs to use the generic interrupt header
Browse files Browse the repository at this point in the history 
The NMI IRQ controller uses the standard flags definition for the IRQ level and
edges.

Use the common header to use defines instead of opaque numbers.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Maxime Ripard committed Jan 21, 2015
1 parent 19882b8 commit a6bac9e
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 10 deletions.
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -157,7 +158,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -90,7 +91,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -132,7 +133,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -150,7 +151,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -154,7 +155,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-m3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -130,7 +131,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -128,7 +129,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -125,7 +126,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -185,7 +186,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
Expand Down Expand Up @@ -137,7 +138,7 @@
compatible = "x-powers,axp209";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 8>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
#interrupt-cells = <1>;
Expand Down

0 comments on commit a6bac9e

Please sign in to comment.