interrupts: Remove #interrupt-cells from ICP nodes

It's not necessary and not in PAPR. HostBoot should probably do a
similar change.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

5 files changed, 0 insertions, 29 deletions

diff --git a/doc/device-tree.txt b/doc/device-tree.txt
index a231d53..742ff43 100644
--- a/doc/device-tree.txt
+++ b/doc/device-tree.txt
@@ -305,7 +305,6 @@
 		compatible = "IBM,ppc-xicp", "IBM,power8-icp";
 		interrupt-controller;
 		#address-cells = <0x0>;
-		#interrupt-cells = <0x1>;
 		device_type = "PowerPC-External-Interrupt-Presentation";
 
 		/*
diff --git a/hdata/paca.c b/hdata/paca.c
index 6d001fd..7284a6e 100644
--- a/hdata/paca.c
+++ b/hdata/paca.c
@@ -190,7 +190,6 @@ static void add_icps(void)
 				irange, sizeof(irange));
 		dt_add_property(icp, "interrupt-controller", NULL, 0);
 		dt_add_property_cells(icp, "#address-cells", 0);
-		dt_add_property_cells(icp, "#interrupt-cells", 1);
 		dt_add_property_string(icp, "device_type",
 				   "PowerPC-External-Interrupt-Presentation");
 		for (i = 0; i < num_threads*2; i += 2) {
diff --git a/hdata/pcia.c b/hdata/pcia.c
index 8d11437..a54d4cf 100644
--- a/hdata/pcia.c
+++ b/hdata/pcia.c
@@ -93,7 +93,6 @@ static void add_icp(const void *pcia, u32 tcount, const char *compat)
 	dt_add_property(icp, "interrupt-controller", NULL, 0);
 	dt_add_property(icp, "reg", reg, rsize);
 	dt_add_property_cells(icp, "#address-cells", 0);
-	dt_add_property_cells(icp, "#interrupt-cells", 1);
 	dt_add_property_string(icp, "device_type",
 			       "PowerPC-External-Interrupt-Presentation");
 	free(reg);
diff --git a/hdata/test/p8-840-spira.dt b/hdata/test/p8-840-spira.dt
index 8746bea..324b616 100644
--- a/hdata/test/p8-840-spira.dt
+++ b/hdata/test/p8-840-spira.dt
@@ -548,7 +548,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8002d00000000000000010000003ffff8002e00000000000000010000003ffff
   8002f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80060000
@@ -560,7 +559,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8006500000000000000010000003ffff8006600000000000000010000003ffff
   800670000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80068000
@@ -572,7 +570,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8006d00000000000000010000003ffff8006e00000000000000010000003ffff
   8006f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80130000
@@ -584,7 +581,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8013500000000000000010000003ffff8013600000000000000010000003ffff
   801370000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80168000
@@ -596,7 +592,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8016d00000000000000010000003ffff8016e00000000000000010000003ffff
   8016f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80170000
@@ -608,7 +603,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8017500000000000000010000003ffff8017600000000000000010000003ffff
   801770000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: ipl-params
diff --git a/hdata/test/p81-811.spira.dt b/hdata/test/p81-811.spira.dt
index 068152c..5b792b4 100644
--- a/hdata/test/p81-811.spira.dt
+++ b/hdata/test/p81-811.spira.dt
@@ -1453,7 +1453,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8002500000000000000010000003ffff8002600000000000000010000003ffff
   800270000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80030000
@@ -1465,7 +1464,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8003500000000000000010000003ffff8003600000000000000010000003ffff
   800370000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80060000
@@ -1477,7 +1475,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8006500000000000000010000003ffff8006600000000000000010000003ffff
   800670000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80068000
@@ -1489,7 +1486,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8006d00000000000000010000003ffff8006e00000000000000010000003ffff
   8006f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80070000
@@ -1501,7 +1497,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8007500000000000000010000003ffff8007600000000000000010000003ffff
   800770000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80128000
@@ -1513,7 +1508,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8012d00000000000000010000003ffff8012e00000000000000010000003ffff
   8012f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80130000
@@ -1525,7 +1519,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8013500000000000000010000003ffff8013600000000000000010000003ffff
   801370000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80160000
@@ -1537,7 +1530,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8016500000000000000010000003ffff8016600000000000000010000003ffff
   801670000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80168000
@@ -1549,7 +1541,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8016d00000000000000010000003ffff8016e00000000000000010000003ffff
   8016f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80170000
@@ -1561,7 +1552,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8017500000000000000010000003ffff8017600000000000000010000003ffff
   801770000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80828000
@@ -1573,7 +1563,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8082d00000000000000010000003ffff8082e00000000000000010000003ffff
   8082f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80830000
@@ -1585,7 +1574,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8083500000000000000010000003ffff8083600000000000000010000003ffff
   808370000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80860000
@@ -1597,7 +1585,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8086500000000000000010000003ffff8086600000000000000010000003ffff
   808670000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80868000
@@ -1609,7 +1596,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8086d00000000000000010000003ffff8086e00000000000000010000003ffff
   8086f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80870000
@@ -1621,7 +1607,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8087500000000000000010000003ffff8087600000000000000010000003ffff
   808770000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80920000
@@ -1633,7 +1618,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8092500000000000000010000003ffff8092600000000000000010000003ffff
   809270000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80928000
@@ -1645,7 +1629,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8092d00000000000000010000003ffff8092e00000000000000010000003ffff
   8092f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80930000
@@ -1657,7 +1640,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8093500000000000000010000003ffff8093600000000000000010000003ffff
   809370000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80968000
@@ -1669,7 +1651,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8096d00000000000000010000003ffff8096e00000000000000010000003ffff
   8096f0000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: interrupt-controller@3ffff80970000
@@ -1681,7 +1662,6 @@ prop: ibm,enabled-idle-states size: 24 val: 6e617000666173742d736c65657000727677
   0010000003ffff8097500000000000000010000003ffff8097600000000000000010000003ffff
   809770000000000000001000
   prop: #address-cells size: 4 val: 00000000
-  prop: #interrupt-cells size: 4 val: 00000001
   prop: device_type size: 40 val: 506f77657250432d45787465726e616c2d496e746572727570742d50726573656e746174696f
   6e00
   node: ipl-params