Răsfoiți Sursa

ARM: dts: Simplify MCT interrupt map for exynos4 SoCs

There is no need to use two cells for interrupt specifiers inside the
MCT interrupt map, so this patch simplifies the map to use one cell.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Tomasz Figa 11 ani în urmă
părinte
comite
84ee1c1506
2 a modificat fișierele cu 15 adăugiri și 16 ștergeri
  1. 8 9
      arch/arm/boot/dts/exynos4210.dtsi
  2. 7 7
      arch/arm/boot/dts/exynos4x12.dtsi

+ 8 - 9
arch/arm/boot/dts/exynos4210.dtsi

@@ -52,21 +52,20 @@
 		compatible = "samsung,exynos4210-mct";
 		compatible = "samsung,exynos4210-mct";
 		reg = <0x10050000 0x800>;
 		reg = <0x10050000 0x800>;
 		interrupt-parent = <&mct_map>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
-			     <4 0>, <5 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
 		clocks = <&clock 3>, <&clock 344>;
 		clocks = <&clock 3>, <&clock 344>;
 		clock-names = "fin_pll", "mct";
 		clock-names = "fin_pll", "mct";
 
 
 		mct_map: mct-map {
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			#address-cells = <0>;
 			#size-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &gic 0 57 0>,
-					<0x1 0 &gic 0 69 0>,
-					<0x2 0 &combiner 12 6>,
-					<0x3 0 &combiner 12 7>,
-					<0x4 0 &gic 0 42 0>,
-					<0x5 0 &gic 0 48 0>;
+			interrupt-map = <0 &gic 0 57 0>,
+					<1 &gic 0 69 0>,
+					<2 &combiner 12 6>,
+					<3 &combiner 12 7>,
+					<4 &gic 0 42 0>,
+					<5 &gic 0 48 0>;
 		};
 		};
 	};
 	};
 
 

+ 7 - 7
arch/arm/boot/dts/exynos4x12.dtsi

@@ -46,19 +46,19 @@
 		compatible = "samsung,exynos4412-mct";
 		compatible = "samsung,exynos4412-mct";
 		reg = <0x10050000 0x800>;
 		reg = <0x10050000 0x800>;
 		interrupt-parent = <&mct_map>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>, <4 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>;
 		clocks = <&clock 3>, <&clock 344>;
 		clocks = <&clock 3>, <&clock 344>;
 		clock-names = "fin_pll", "mct";
 		clock-names = "fin_pll", "mct";
 
 
 		mct_map: mct-map {
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			#address-cells = <0>;
 			#size-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &gic 0 57 0>,
-					<0x1 0 &combiner 12 5>,
-					<0x2 0 &combiner 12 6>,
-					<0x3 0 &combiner 12 7>,
-					<0x4 0 &gic 1 12 0>;
+			interrupt-map = <0 &gic 0 57 0>,
+					<1 &combiner 12 5>,
+					<2 &combiner 12 6>,
+					<3 &combiner 12 7>,
+					<4 &gic 1 12 0>;
 		};
 		};
 	};
 	};