From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Wed, 15 Jun 2016 10:37:33 +0000 (+0200)
Subject: brcm63xx: use upstreamed compatible name for the periph intc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80403e4558107a3019cfe5ef69eac22bb7866123;p=openwrt%2Fstaging%2Fnbd.git

brcm63xx: use upstreamed compatible name for the periph intc

This makes the eventual migration to bmips easier, as dts files
will require less changes.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

diff --git a/target/linux/brcm63xx/dts/bcm3368.dtsi b/target/linux/brcm63xx/dts/bcm3368.dtsi
index 6828b345b3..5c2052962c 100644
--- a/target/linux/brcm63xx/dts/bcm3368.dtsi
+++ b/target/linux/brcm63xx/dts/bcm3368.dtsi
@@ -53,7 +53,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fff8c00c {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0xfff8c00c 0x8>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6318.dtsi b/target/linux/brcm63xx/dts/bcm6318.dtsi
index f851a9cbf5..115b15c7fe 100644
--- a/target/linux/brcm63xx/dts/bcm6318.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6318.dtsi
@@ -47,7 +47,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0x10000020 0x20>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm63268.dtsi b/target/linux/brcm63xx/dts/bcm63268.dtsi
index 0a1f8b17cf..47894f8b42 100644
--- a/target/linux/brcm63xx/dts/bcm63268.dtsi
+++ b/target/linux/brcm63xx/dts/bcm63268.dtsi
@@ -53,7 +53,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0x10000020 0x20>,
 			      <0x10000040 0x20>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6328.dtsi b/target/linux/brcm63xx/dts/bcm6328.dtsi
index a0b1316423..b49958a7b6 100644
--- a/target/linux/brcm63xx/dts/bcm6328.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6328.dtsi
@@ -46,7 +46,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0x10000020 0x10>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6338.dtsi b/target/linux/brcm63xx/dts/bcm6338.dtsi
index d578a5b59b..7d48e86b8c 100644
--- a/target/linux/brcm63xx/dts/bcm6338.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6338.dtsi
@@ -46,7 +46,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0xfffe000c 0x8>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6345.dtsi b/target/linux/brcm63xx/dts/bcm6345.dtsi
index f70246860c..b16c132cea 100644
--- a/target/linux/brcm63xx/dts/bcm6345.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6345.dtsi
@@ -46,7 +46,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0xfffe000c 0x9>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6348.dtsi b/target/linux/brcm63xx/dts/bcm6348.dtsi
index 81e99ed4d0..7edda30845 100644
--- a/target/linux/brcm63xx/dts/bcm6348.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6348.dtsi
@@ -47,7 +47,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0xfffe000c 0x8>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6358.dtsi b/target/linux/brcm63xx/dts/bcm6358.dtsi
index bc3784a221..fa0b5b8a6e 100644
--- a/target/linux/brcm63xx/dts/bcm6358.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6358.dtsi
@@ -53,7 +53,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0xfffe000c 0x8>,
 			      <0xfffe0038 0x8>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6362.dtsi b/target/linux/brcm63xx/dts/bcm6362.dtsi
index 6604f5cc62..40f6b9ec29 100644
--- a/target/linux/brcm63xx/dts/bcm6362.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6362.dtsi
@@ -53,7 +53,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0x10000020 0x10>,
 			      <0x10000030 0x10>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6368.dtsi b/target/linux/brcm63xx/dts/bcm6368.dtsi
index 7dbe9ec49e..52bcec4466 100644
--- a/target/linux/brcm63xx/dts/bcm6368.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6368.dtsi
@@ -65,7 +65,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-periph-intc";
+			compatible = "brcm,bcm6345-l1-intc";
 			reg = <0x10000020 0x10>,
 			      <0x10000030 0x10>;
 
diff --git a/target/linux/brcm63xx/patches-4.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch b/target/linux/brcm63xx/patches-4.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
index 3ed857090a..11a815a20e 100644
--- a/target/linux/brcm63xx/patches-4.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
+++ b/target/linux/brcm63xx/patches-4.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch
@@ -431,7 +431,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +	return ret;
 +}
 +
-+IRQCHIP_DECLARE(bcm6345_periph_intc, "brcm,bcm6345-periph-intc",
++IRQCHIP_DECLARE(bcm6345_periph_intc, "brcm,bcm6345-l1-intc",
 +		bcm6345_periph_of_init);
 +#endif
 --- /dev/null