p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: dts: meson: use GIC_SPI and IRQ_TYPE_EDGE_RISING macros 

This makes meson.dtsi easier to read as we are not using magic numbers
for the GIC interrupt type (GIC_SPI) and the interrupt polarity
(IRQ_TYPE_EDGE_RISING).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Martin Blumenstingl 2017-06-15 23:33:44 +02:00 committed by Kevin Hilman
parent 7a16f06b90
commit 5239e05048
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/boot/dts/meson.dtsi
View File

@ -45,6 +45,8 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
/include/ "skeleton.dtsi" /include/ "skeleton.dtsi"
/ { / {
@ -81,21 +83,21 @@ cbus: cbus@c1100000 {
uart_A: serial@84c0 { uart_A: serial@84c0 {
compatible = "amlogic,meson-uart"; compatible = "amlogic,meson-uart";
reg = <0x84c0 0x18>; reg = <0x84c0 0x18>;
interrupts = <0 26 1>; interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
}; };
uart_B: serial@84dc { uart_B: serial@84dc {
compatible = "amlogic,meson-uart"; compatible = "amlogic,meson-uart";
reg = <0x84dc 0x18>; reg = <0x84dc 0x18>;
interrupts = <0 75 1>; interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
}; };
i2c_A: i2c@8500 { i2c_A: i2c@8500 {
compatible = "amlogic,meson6-i2c"; compatible = "amlogic,meson6-i2c";
reg = <0x8500 0x20>; reg = <0x8500 0x20>;
interrupts = <0 21 1>; interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
@ -104,14 +106,14 @@ i2c_A: i2c@8500 {
uart_C: serial@8700 { uart_C: serial@8700 {
compatible = "amlogic,meson-uart"; compatible = "amlogic,meson-uart";
reg = <0x8700 0x18>; reg = <0x8700 0x18>;
interrupts = <0 93 1>; interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
}; };
i2c_B: i2c@87c0 { i2c_B: i2c@87c0 {
compatible = "amlogic,meson6-i2c"; compatible = "amlogic,meson6-i2c";
reg = <0x87c0 0x20>; reg = <0x87c0 0x20>;
interrupts = <0 128 1>; interrupts = <GIC_SPI 128 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
@ -128,13 +130,13 @@ spifc: spi@8c80 {
wdt: watchdog@9900 { wdt: watchdog@9900 {
compatible = "amlogic,meson6-wdt"; compatible = "amlogic,meson6-wdt";
reg = <0x9900 0x8>; reg = <0x9900 0x8>;
interrupts = <0 0 1>; interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
}; };
timer@9940 { timer@9940 {
compatible = "amlogic,meson6-timer"; compatible = "amlogic,meson6-timer";
reg = <0x9940 0x18>; reg = <0x9940 0x18>;
interrupts = <0 10 1>; interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>;
}; };
}; };
@ -148,21 +150,21 @@ aobus: aobus@c8100000 {
ir_receiver: ir-receiver@480 { ir_receiver: ir-receiver@480 {
compatible= "amlogic,meson6-ir"; compatible= "amlogic,meson6-ir";
reg = <0x480 0x20>; reg = <0x480 0x20>;
interrupts = <0 15 1>; interrupts = <GIC_SPI 15 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
}; };
uart_AO: serial@4c0 { uart_AO: serial@4c0 {
compatible = "amlogic,meson-uart"; compatible = "amlogic,meson-uart";
reg = <0x4c0 0x18>; reg = <0x4c0 0x18>;
interrupts = <0 90 1>; interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
}; };
i2c_AO: i2c@500 { i2c_AO: i2c@500 {
compatible = "amlogic,meson6-i2c"; compatible = "amlogic,meson6-i2c";
reg = <0x500 0x20>; reg = <0x500 0x20>;
interrupts = <0 92 1>; interrupts = <GIC_SPI 92 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
@ -173,7 +175,7 @@ ethmac: ethernet@c9410000 {
compatible = "amlogic,meson6-dwmac", "snps,dwmac"; compatible = "amlogic,meson6-dwmac", "snps,dwmac";
reg = <0xc9410000 0x10000 reg = <0xc9410000 0x10000
0xc1108108 0x4>; 0xc1108108 0x4>;
interrupts = <0 8 1>; interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "macirq"; interrupt-names = "macirq";
status = "disabled"; status = "disabled";
}; };