ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT

Move code added by Felix to the bcm-ns.dtsi which uses dual licensing.
That syncs more Northstar code to be based on the same licensing schema.

This code was added in the commit 1ff80363524c ("ARM: BCM5301X: Add
profiling support").

Cc: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20230916083057.10458-1-zajec5@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
index 88fda18af1f8e6f80d8a263a907652ac1634783c..f0f3a718c4130a79908d8cc2ad5386a98a5241fb 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
@@ -14,6 +14,13 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       pmu {
+               compatible = "arm,cortex-a9-pmu";
+               interrupts =
+                       <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                       <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+       };
+
        chipcommon-a-bus@18000000 {
                compatible = "simple-bus";
                ranges = <0x00000000 0x18000000 0x00001000>;

diff --git a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
index 600a1b54f2ae5c8670d8a97d0cd12b71dfa6d98d..de46dbd5b876ab81bb1722ecb1b635b279b4c53a 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
@@ -26,13 +26,6 @@
                };
        };
 
-       pmu {
-               compatible = "arm,cortex-a9-pmu";
-               interrupts =
-                       <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-                       <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-       };
-
        clocks {
                #address-cells = <1>;
                #size-cells = <1>;