Skip to content

L
linux
Commit c92a4fb2 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files
Options

ARM: dts: exynos: Use human-friendly symbols for GIC interrupt properties 

Replace hard-coded values of type of GIC interrupt and its flags with
respective macros from header to increase code readability.
Suggested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 6ff0b90d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 85 deletions
arch/arm/boot/dts/exynos5.dtsi
View file @ c92a4fb2
...@@ -55,38 +55,38 @@ combiner: interrupt-controller@10440000 { ...@@ -55,38 +55,38 @@ combiner: interrupt-controller@10440000 {
interrupt-controller; interrupt-controller;
samsung,combiner-nr = <32>; samsung,combiner-nr = <32>;
reg = <0x10440000 0x1000>; reg = <0x10440000 0x1000>;
interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<0 1 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
<0 2 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
<0 3 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
<0 4 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
<0 5 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
<0 6 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<0 7 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
<0 8 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<0 9 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<0 10 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
<0 11 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<0 12 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<0 13 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
<0 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<0 15 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
<0 16 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
<0 17 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
<0 18 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
<0 19 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
<0 20 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
<0 21 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
<0 22 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
<0 23 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
<0 24 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
<0 25 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
<0 26 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
<0 27 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
<0 28 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
<0 29 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
<0 30 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
<0 31 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
}; };
gic: interrupt-controller@10481000 { gic: interrupt-controller@10481000 {
...@@ -109,31 +109,31 @@ sysreg_system_controller: syscon@10050000 { ...@@ -109,31 +109,31 @@ sysreg_system_controller: syscon@10050000 {
serial_0: serial@12C00000 { serial_0: serial@12C00000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C00000 0x100>; reg = <0x12C00000 0x100>;
interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
}; };
serial_1: serial@12C10000 { serial_1: serial@12C10000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C10000 0x100>; reg = <0x12C10000 0x100>;
interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
}; };
serial_2: serial@12C20000 { serial_2: serial@12C20000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C20000 0x100>; reg = <0x12C20000 0x100>;
interrupts = <0 53 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
}; };
serial_3: serial@12C30000 { serial_3: serial@12C30000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C30000 0x100>; reg = <0x12C30000 0x100>;
interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
}; };
i2c_0: i2c@12C60000 { i2c_0: i2c@12C60000 {
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x12C60000 0x100>; reg = <0x12C60000 0x100>;
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
samsung,sysreg-phandle = <&sysreg_system_controller>; samsung,sysreg-phandle = <&sysreg_system_controller>;
...@@ -143,7 +143,7 @@ i2c_0: i2c@12C60000 { ...@@ -143,7 +143,7 @@ i2c_0: i2c@12C60000 {
i2c_1: i2c@12C70000 { i2c_1: i2c@12C70000 {
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x12C70000 0x100>; reg = <0x12C70000 0x100>;
interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
samsung,sysreg-phandle = <&sysreg_system_controller>; samsung,sysreg-phandle = <&sysreg_system_controller>;
...@@ -153,7 +153,7 @@ i2c_1: i2c@12C70000 { ...@@ -153,7 +153,7 @@ i2c_1: i2c@12C70000 {
i2c_2: i2c@12C80000 { i2c_2: i2c@12C80000 {
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x12C80000 0x100>; reg = <0x12C80000 0x100>;
interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
samsung,sysreg-phandle = <&sysreg_system_controller>; samsung,sysreg-phandle = <&sysreg_system_controller>;
...@@ -163,7 +163,7 @@ i2c_2: i2c@12C80000 { ...@@ -163,7 +163,7 @@ i2c_2: i2c@12C80000 {
i2c_3: i2c@12C90000 { i2c_3: i2c@12C90000 {
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x12C90000 0x100>; reg = <0x12C90000 0x100>;
interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
samsung,sysreg-phandle = <&sysreg_system_controller>; samsung,sysreg-phandle = <&sysreg_system_controller>;
...@@ -180,8 +180,8 @@ pwm: pwm@12DD0000 { ...@@ -180,8 +180,8 @@ pwm: pwm@12DD0000 {
rtc: rtc@101E0000 { rtc: rtc@101E0000 {
compatible = "samsung,s3c6410-rtc"; compatible = "samsung,s3c6410-rtc";
reg = <0x101E0000 0x100>; reg = <0x101E0000 0x100>;
interrupts = <0 43 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
<0 44 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/exynos5250.dtsi
View file @ c92a4fb2
...@@ -153,10 +153,10 @@ clock_audss: audss-clock-controller@3810000 { ...@@ -153,10 +153,10 @@ clock_audss: audss-clock-controller@3810000 {
timer { timer {
compatible = "arm,armv7-timer"; compatible = "arm,armv7-timer";
interrupts = <1 13 0xf08>, interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<1 14 0xf08>, <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<1 11 0xf08>, <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<1 10 0xf08>; <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
/* /*
* Unfortunately we need this since some versions * Unfortunately we need this since some versions
* of U-Boot on Exynos don't set the CNTFRQ register, * of U-Boot on Exynos don't set the CNTFRQ register,
......
arch/arm/boot/dts/exynos5420.dtsi
View file @ c92a4fb2
This diff is collapsed.
arch/arm/boot/dts/exynos5440.dtsi
View file @ c92a4fb2
...@@ -200,7 +200,7 @@ gmac: ethernet@00230000 { ...@@ -200,7 +200,7 @@ gmac: ethernet@00230000 {
compatible = "snps,dwmac-3.70a", "snps,dwmac"; compatible = "snps,dwmac-3.70a", "snps,dwmac";
reg = <0x00230000 0x8000>; reg = <0x00230000 0x8000>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <GIC_SPI 31 4>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq"; interrupt-names = "macirq";
phy-mode = "sgmii"; phy-mode = "sgmii";
clocks = <&clock CLK_GMAC0>; clocks = <&clock CLK_GMAC0>;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7