Re: [PATCH] ARM: DT: Exynos: fix number of interrupt-cells in mct node

Kukjin Kim <kgene.kim@xxxxxxxxxxx> · Mon, 19 Aug 2013 04:27:00 +0900

On 08/12/13 15:23, Chander Kashyap wrote:
ping

On 23 July 2013 15:17, Chander Kashyap<chander.kashyap@xxxxxxxxxx>  wrote:
ping.

On 14 June 2013 20:11, Chander Kashyap<chander.kashyap@xxxxxxxxxx>  wrote:
Two cells were used to specify interrupts in mct node, while second cell
always remains unused. Hence use only one cell.
Suggested by Tomasz Figa.

Signed-off-by: Chander Kashyap<chander.kashyap@xxxxxxxxxx>
---
  arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
  arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
  arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
  arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
  4 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 54710de..ad50010 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -52,23 +52,22 @@
                 compatible = "samsung,exynos4210-mct";
                 reg =<0x10050000 0x800>;
                 interrupt-controller;
-               #interrups-cells =<2>;
+               #interrups-cells =<1>;
                 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>;
                 clock-names = "fin_pll", "mct";

                 mct_map: mct-map {
-                       #interrupt-cells =<2>;
+                       #interrupt-cells =<1>;
                         #address-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>;
                 };
         };

diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
index c0f60f4..ba9ada1 100644
--- a/arch/arm/boot/dts/exynos4212.dtsi
+++ b/arch/arm/boot/dts/exynos4212.dtsi
@@ -39,21 +39,20 @@
                 compatible = "samsung,exynos4412-mct";
                 reg =<0x10050000 0x800>;
                 interrupt-controller;
-               #interrups-cells =<2>;
+               #interrups-cells =<1>;
                 interrupt-parent =<&mct_map>;
-               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
-<4 0>,<5 0>;
+               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;

                 mct_map: mct-map {
-                       #interrupt-cells =<2>;
+                       #interrupt-cells =<>;
                         #address-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>,
-<0x5 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>,
+<5&gic 1 12 0>;
                 };
         };
  };
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 270b389..a680de7 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -39,25 +39,24 @@
                 compatible = "samsung,exynos4412-mct";
                 reg =<0x10050000 0x800>;
                 interrupt-controller;
-               #interrups-cells =<2>;
+               #interrups-cells =<1>;
                 interrupt-parent =<&mct_map>;
-               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
-<4 0>,<5 0>,<6 0>,<7 0>;
+               interrupts =<0>,<1>,<2>,<3>,<4>,<5>,<6>,<7>;
                 clocks =<&clock 3>,<&clock 344>;
                 clock-names = "fin_pll", "mct";

                 mct_map: mct-map {
-                       #interrupt-cells =<2>;
+                       #interrupt-cells =<1>;
                         #address-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>,
-<0x5 0&gic 1 12 0>,
-<0x6 0&gic 1 12 0>,
-<0x7 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>,
+<5&gic 1 12 0>,
+<6&gic 1 12 0>,
+<7&gic 1 12 0>;
                 };
         };

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index a7cf3f5..4e633ef 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -94,23 +94,22 @@
                 compatible = "samsung,exynos4210-mct";
                 reg =<0x101C0000 0x800>;
                 interrupt-controller;
-               #interrups-cells =<2>;
+               #interrups-cells =<1>;
                 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 1>,<&clock 335>;
                 clock-names = "fin_pll", "mct";

                 mct_map: mct-map {
-                       #interrupt-cells =<2>;
+                       #interrupt-cells =<1>;
                         #address-cells =<0>;
                         #size-cells =<0>;
-                       interrupt-map =<0x0 0&combiner 23 3>,
-<0x1 0&combiner 23 4>,
-<0x2 0&combiner 25 2>,
-<0x3 0&combiner 25 3>,
-<0x4 0&gic 0 120 0>,
-<0x5 0&gic 0 121 0>;
+                       interrupt-map =<0&combiner 23 3>,
+<1&combiner 23 4>,
+<2&combiner 25 2>,
+<3&combiner 25 3>,
+<4&gic 0 120 0>,
+<5&gic 0 121 0>;
                 };
         };

--
1.7.9.5

Should be updated with regarding Doc.

Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html







