dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm: dts: ls1028a: fix interrupt properties

Browse Source 
Sync the interrupt properties with the ones from Linux. Also use the
constants provided by the dt-bindings header. Please note, that there
are actual changes/fixes in the irq flags. U-Boot won't use the
interrupt properties anyway. It's just to be consistent with the Linux
device tree.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Michael Walle
2019-12-18 00:10:00 +01:00
committed by Priyanka Jain
parent 922ac0f661
commit 3ffe090d4e
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
arch/arm/dts/fsl-ls1028a.dtsi
View File

@@ -6,6 +6,8 @@
* *
*/ */
#include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
compatible = "fsl,ls1028a"; compatible = "fsl,ls1028a";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@@ -38,15 +40,20 @@
<0x0 0x06040000 0 0x40000>; <0x0 0x06040000 0 0x40000>;
#interrupt-cells = <3>; #interrupt-cells = <3>;
interrupt-controller; interrupt-controller;
interrupts = <1 9 0x4>; interrupts = <GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |
IRQ_TYPE_LEVEL_LOW)>;
}; };
timer { timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
<1 14 0x8>, /* Physical Non-Secure PPI, active-low */ IRQ_TYPE_LEVEL_LOW)>,
<1 11 0x8>, /* Virtual PPI, active-low */ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
<1 10 0x8>; /* Hypervisor PPI, active-low */ IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_LOW)>;
}; };
fspi: flexspi@20c0000 { fspi: flexspi@20c0000 {
@@ -58,7 +65,7 @@
reg-names = "fspi_base", "fspi_mmap"; reg-names = "fspi_base", "fspi_mmap";
clocks = <&clockgen 4 3>, <&clockgen 4 3>; clocks = <&clockgen 4 3>, <&clockgen 4 3>;
clock-names = "fspi_en", "fspi"; clock-names = "fspi_en", "fspi";
interrupts = <0 25 0x4>; interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
@@ -66,7 +73,7 @@
device_type = "serial"; device_type = "serial";
compatible = "fsl,ns16550", "ns16550a"; compatible = "fsl,ns16550", "ns16550a";
reg = <0x0 0x21c0500 0x0 0x100>; reg = <0x0 0x21c0500 0x0 0x100>;
interrupts = <0 32 0x1>; /* edge triggered */ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
@@ -74,7 +81,7 @@
device_type = "serial"; device_type = "serial";
compatible = "fsl,ns16550", "ns16550a"; compatible = "fsl,ns16550", "ns16550a";
reg = <0x0 0x21c0600 0x0 0x100>; reg = <0x0 0x21c0600 0x0 0x100>;
interrupts = <0 32 0x1>; /* edge triggered */ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
@@ -150,7 +157,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2000000 0x0 0x10000>; reg = <0x0 0x2000000 0x0 0x10000>;
interrupts = <0 34 0x4>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -161,7 +168,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2010000 0x0 0x10000>; reg = <0x0 0x2010000 0x0 0x10000>;
interrupts = <0 34 0x4>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -172,7 +179,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2020000 0x0 0x10000>; reg = <0x0 0x2020000 0x0 0x10000>;
interrupts = <0 35 0x4>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -183,7 +190,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2030000 0x0 0x10000>; reg = <0x0 0x2030000 0x0 0x10000>;
interrupts = <0 35 0x4>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -194,7 +201,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2040000 0x0 0x10000>; reg = <0x0 0x2040000 0x0 0x10000>;
interrupts = <0 74 0x4>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -205,7 +212,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2050000 0x0 0x10000>; reg = <0x0 0x2050000 0x0 0x10000>;
interrupts = <0 74 0x4>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -216,7 +223,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2060000 0x0 0x10000>; reg = <0x0 0x2060000 0x0 0x10000>;
interrupts = <0 75 0x4>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -227,7 +234,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2070000 0x0 0x10000>; reg = <0x0 0x2070000 0x0 0x10000>;
interrupts = <0 75 0x4>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "i2c"; clock-names = "i2c";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
status = "disabled"; status = "disabled";
@@ -236,7 +243,7 @@
usb1: usb3@3100000 { usb1: usb3@3100000 {
compatible = "fsl,layerscape-dwc3"; compatible = "fsl,layerscape-dwc3";
reg = <0x0 0x3100000 0x0 0x10000>; reg = <0x0 0x3100000 0x0 0x10000>;
interrupts = <0 80 0x4>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host"; dr_mode = "host";
status = "disabled"; status = "disabled";
}; };
@@ -244,7 +251,7 @@
usb2: usb3@3110000 { usb2: usb3@3110000 {
compatible = "fsl,layerscape-dwc3"; compatible = "fsl,layerscape-dwc3";
reg = <0x0 0x3110000 0x0 0x10000>; reg = <0x0 0x3110000 0x0 0x10000>;
interrupts = <0 81 0x4>; interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host"; dr_mode = "host";
status = "disabled"; status = "disabled";
}; };
@@ -254,7 +261,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2100000 0x0 0x10000>; reg = <0x0 0x2100000 0x0 0x10000>;
interrupts = <0 26 0x4>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "dspi"; clock-names = "dspi";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
num-cs = <5>; num-cs = <5>;
@@ -267,7 +274,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2110000 0x0 0x10000>; reg = <0x0 0x2110000 0x0 0x10000>;
interrupts = <0 26 0x4>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "dspi"; clock-names = "dspi";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
num-cs = <5>; num-cs = <5>;
@@ -280,7 +287,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x2120000 0x0 0x10000>; reg = <0x0 0x2120000 0x0 0x10000>;
interrupts = <0 26 0x4>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "dspi"; clock-names = "dspi";
clocks = <&clockgen 4 0>; clocks = <&clockgen 4 0>;
num-cs = <5>; num-cs = <5>;
@@ -291,7 +298,7 @@
esdhc0: esdhc@2140000 { esdhc0: esdhc@2140000 {
compatible = "fsl,esdhc"; compatible = "fsl,esdhc";
reg = <0x0 0x2140000 0x0 0x10000>; reg = <0x0 0x2140000 0x0 0x10000>;
interrupts = <0 28 0x4>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
big-endian; big-endian;
bus-width = <4>; bus-width = <4>;
status = "disabled"; status = "disabled";
@@ -300,7 +307,7 @@
esdhc1: esdhc@2150000 { esdhc1: esdhc@2150000 {
compatible = "fsl,esdhc"; compatible = "fsl,esdhc";
reg = <0x0 0x2150000 0x0 0x10000>; reg = <0x0 0x2150000 0x0 0x10000>;
interrupts = <0 63 0x4>; interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
big-endian; big-endian;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
@@ -312,7 +319,7 @@
reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */ reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */
0x7 0x100520 0x0 0x4>; /* ecc sata addr*/ 0x7 0x100520 0x0 0x4>; /* ecc sata addr*/
reg-names = "sata-base", "ecc-addr"; reg-names = "sata-base", "ecc-addr";
interrupts = <0 133 4>; interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };