ARM: dts: gemini: Consolidate PCI interrupt-map properties

The Gemini PCI 'interrupt-map' does not vary by board, so let's move
the definition to a common location. This avoids having incomplete
interrupt properties (i.e. #interrupt-cells without interrupt-map).

Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index c79a2a02dd6bf672b61274f2f44ec5cb45e06f58..396149664297fdf81f4b15499003af95af58c684 100644 (file)
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -439,24 +439,6 @@
 
                pci@50000000 {
                        status = "okay";
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map =
-                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
-                               <0x4800 0 0 2 &pci_intc 1>,
-                               <0x4800 0 0 3 &pci_intc 2>,
-                               <0x4800 0 0 4 &pci_intc 3>,
-                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
-                               <0x5000 0 0 2 &pci_intc 2>,
-                               <0x5000 0 0 3 &pci_intc 3>,
-                               <0x5000 0 0 4 &pci_intc 0>,
-                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
-                               <0x5800 0 0 2 &pci_intc 3>,
-                               <0x5800 0 0 3 &pci_intc 0>,
-                               <0x5800 0 0 4 &pci_intc 1>,
-                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
-                               <0x6000 0 0 2 &pci_intc 0>,
-                               <0x6000 0 0 3 &pci_intc 1>,
-                               <0x6000 0 0 4 &pci_intc 2>;
                };
 
                ethernet@60000000 {

diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts
index c78e55fd25629517de87bc3b350fd5ca59465ad3..91c19e8ebfe8b7810fd2e28fd15016cc43d40b59 100644 (file)
--- a/arch/arm/boot/dts/gemini-sl93512r.dts
+++ b/arch/arm/boot/dts/gemini-sl93512r.dts
@@ -256,24 +256,6 @@
 
                pci@50000000 {
                        status = "okay";
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map =
-                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
-                               <0x4800 0 0 2 &pci_intc 1>,
-                               <0x4800 0 0 3 &pci_intc 2>,
-                               <0x4800 0 0 4 &pci_intc 3>,
-                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
-                               <0x5000 0 0 2 &pci_intc 2>,
-                               <0x5000 0 0 3 &pci_intc 3>,
-                               <0x5000 0 0 4 &pci_intc 0>,
-                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
-                               <0x5800 0 0 2 &pci_intc 3>,
-                               <0x5800 0 0 3 &pci_intc 0>,
-                               <0x5800 0 0 4 &pci_intc 1>,
-                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
-                               <0x6000 0 0 2 &pci_intc 0>,
-                               <0x6000 0 0 3 &pci_intc 1>,
-                               <0x6000 0 0 4 &pci_intc 2>;
                };
 
                ethernet@60000000 {

diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 1b64cc80b55a9e0b24cfaea7a63cce40cec211af..d0efd76695da6e80b402d0af6baf1cf362c5651a 100644 (file)
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -252,24 +252,6 @@
 
                pci@50000000 {
                        status = "okay";
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map =
-                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
-                               <0x4800 0 0 2 &pci_intc 1>,
-                               <0x4800 0 0 3 &pci_intc 2>,
-                               <0x4800 0 0 4 &pci_intc 3>,
-                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
-                               <0x5000 0 0 2 &pci_intc 2>,
-                               <0x5000 0 0 3 &pci_intc 3>,
-                               <0x5000 0 0 4 &pci_intc 0>,
-                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
-                               <0x5800 0 0 2 &pci_intc 3>,
-                               <0x5800 0 0 3 &pci_intc 0>,
-                               <0x5800 0 0 4 &pci_intc 1>,
-                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
-                               <0x6000 0 0 2 &pci_intc 0>,
-                               <0x6000 0 0 3 &pci_intc 1>,
-                               <0x6000 0 0 4 &pci_intc 2>;
                };
 
                ethernet@60000000 {

diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index 5602ba8f30f2f1728613cef97da109ef85cfe6ef..de3c4416b0fb090b6b57b8b644922273dc618629 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -140,24 +140,6 @@
 
                pci@50000000 {
                        status = "okay";
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map =
-                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
-                               <0x4800 0 0 2 &pci_intc 1>,
-                               <0x4800 0 0 3 &pci_intc 2>,
-                               <0x4800 0 0 4 &pci_intc 3>,
-                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
-                               <0x5000 0 0 2 &pci_intc 2>,
-                               <0x5000 0 0 3 &pci_intc 3>,
-                               <0x5000 0 0 4 &pci_intc 0>,
-                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
-                               <0x5800 0 0 2 &pci_intc 3>,
-                               <0x5800 0 0 3 &pci_intc 0>,
-                               <0x5800 0 0 4 &pci_intc 1>,
-                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
-                               <0x6000 0 0 2 &pci_intc 0>,
-                               <0x6000 0 0 3 &pci_intc 1>,
-                               <0x6000 0 0 4 &pci_intc 2>;
                };
 
                ethernet@60000000 {

diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index a4a260c36d752fe59b11a44ab00c6c3e01c00e8a..e5ceaadbcc1a1f8cab3d586429c2b64b22897293 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -151,24 +151,6 @@
 
                pci@50000000 {
                        status = "okay";
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map =
-                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
-                               <0x4800 0 0 2 &pci_intc 1>,
-                               <0x4800 0 0 3 &pci_intc 2>,
-                               <0x4800 0 0 4 &pci_intc 3>,
-                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
-                               <0x5000 0 0 2 &pci_intc 2>,
-                               <0x5000 0 0 3 &pci_intc 3>,
-                               <0x5000 0 0 4 &pci_intc 0>,
-                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
-                               <0x5800 0 0 2 &pci_intc 3>,
-                               <0x5800 0 0 3 &pci_intc 0>,
-                               <0x5800 0 0 4 &pci_intc 1>,
-                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
-                               <0x6000 0 0 2 &pci_intc 0>,
-                               <0x6000 0 0 3 &pci_intc 1>,
-                               <0x6000 0 0 4 &pci_intc 2>;
                };
 
                ethernet@60000000 {

diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index 9fe0fd93ac9e2f15c6fc0778b280b6ebf2cf08ae..e836bd0818d42b213cfc1545baa4b31c6e9ad606 100644 (file)
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -289,9 +289,28 @@
                        device_type = "pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
-                       #interrupt-cells = <1>;
                        status = "disabled";
 
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0xf800 0 0 7>;
+                       interrupt-map =
+                               <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
+                               <0x4800 0 0 2 &pci_intc 1>,
+                               <0x4800 0 0 3 &pci_intc 2>,
+                               <0x4800 0 0 4 &pci_intc 3>,
+                               <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
+                               <0x5000 0 0 2 &pci_intc 2>,
+                               <0x5000 0 0 3 &pci_intc 3>,
+                               <0x5000 0 0 4 &pci_intc 0>,
+                               <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
+                               <0x5800 0 0 2 &pci_intc 3>,
+                               <0x5800 0 0 3 &pci_intc 0>,
+                               <0x5800 0 0 4 &pci_intc 1>,
+                               <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
+                               <0x6000 0 0 2 &pci_intc 0>,
+                               <0x6000 0 0 3 &pci_intc 1>,
+                               <0x6000 0 0 4 &pci_intc 2>;
+
                        bus-range = <0x00 0xff>;
                        /* PCI ranges mappings */
                        ranges =