[PATCH 2/2] ARM: dts: BCM5301X: Relicense Florian's code to the GPL 2.0+ / MIT

[Rafał Miłecki]

From: Rafał Miłecki <rafal at milecki.pl>

All BCM5301X device DTS files use dual licensing. Try the same for SoC.

Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 arch/arm/boot/dts/bcm-ns.dtsi   | 36 ++++++++++++++++++++++++++++++
 arch/arm/boot/dts/bcm5301x.dtsi | 39 ---------------------------------
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi
index 21d672aba75a..cc977bbc142b 100644
--- a/arch/arm/boot/dts/bcm-ns.dtsi
+++ b/arch/arm/boot/dts/bcm-ns.dtsi
@@ -19,6 +19,8 @@ chipcommon: chipcommon at 0 {
 
 			gpio-controller;
 			#gpio-cells = <2>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
 		pcie0: pcie at 12000 {
@@ -109,6 +111,22 @@ xhci_port1: port at 1 {
 				};
 			};
 		};
+
+		gmac0: ethernet at 24000 {
+			reg = <0x24000 0x800>;
+		};
+
+		gmac1: ethernet at 25000 {
+			reg = <0x25000 0x800>;
+		};
+
+		gmac2: ethernet at 26000 {
+			reg = <0x26000 0x800>;
+		};
+
+		gmac3: ethernet at 27000 {
+			reg = <0x27000 0x800>;
+		};
 	};
 
 	mdio: mdio at 18003000 {
@@ -118,6 +136,24 @@ mdio: mdio at 18003000 {
 		#address-cells = <1>;
 	};
 
+	rng: rng at 18004000 {
+		compatible = "brcm,bcm5301x-rng";
+		reg = <0x18004000 0x14>;
+	};
+
+	srab: ethernet-switch at 18007000 {
+		compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab";
+		reg = <0x18007000 0x1000>;
+
+		status = "disabled";
+
+		/* ports are defined in board DTS */
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
 	dmu-bus at 1800c000 {
 		compatible = "simple-bus";
 		ranges = <0 0x1800c000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 2aa3a9f09641..2890fa3c5e67 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -218,30 +218,9 @@ axi at 18000000 {
 			<0x00028000 6 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
 			<0x00028000 7 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
 
-		chipcommon at 0 {
-			interrupt-controller;
-			#interrupt-cells = <2>;
-		};
-
 		pcie2: pcie at 14000 {
 			reg = <0x00014000 0x1000>;
 		};
-
-		gmac0: ethernet at 24000 {
-			reg = <0x24000 0x800>;
-		};
-
-		gmac1: ethernet at 25000 {
-			reg = <0x25000 0x800>;
-		};
-
-		gmac2: ethernet at 26000 {
-			reg = <0x26000 0x800>;
-		};
-
-		gmac3: ethernet at 27000 {
-			reg = <0x27000 0x800>;
-		};
 	};
 
 	pwm: pwm at 18002000 {
@@ -322,24 +301,6 @@ genpll: clock-controller at 140 {
 		};
 	};
 
-	srab: ethernet-switch at 18007000 {
-		compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab";
-		reg = <0x18007000 0x1000>;
-
-		status = "disabled";
-
-		/* ports are defined in board DTS */
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-	};
-
-	rng: rng at 18004000 {
-		compatible = "brcm,bcm5301x-rng";
-		reg = <0x18004000 0x14>;
-	};
-
 	nand_controller: nand-controller at 18028000 {
 		compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
 		reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
-- 
2.35.3