diff mbox series

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

Message ID 20230916083057.10458-1-zajec5@gmail.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT | expand

Commit Message

Rafał Miłecki Sept. 16, 2023, 8:30 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

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>
---
Felix: can I get your Acked-by for this, please?

I managed to cleanup most of Northstar licensing already.
---
 arch/arm/boot/dts/broadcom/bcm-ns.dtsi   | 7 +++++++
 arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

Comments

Felix Fietkau Sept. 22, 2023, 9:18 a.m. UTC | #1 
On 16.09.23 10:30, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> 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>
> ---
> Felix: can I get your Acked-by for this, please?

Acked-by: Felix Fietkau <nbd@nbd.name>

- Felix
Florian Fainelli Oct. 2, 2023, 11:21 p.m. UTC | #2 
From: Florian Fainelli <f.fainelli@gmail.com>

On Sat, 16 Sep 2023 10:30:57 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> 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>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
index 88fda18af1f8..f0f3a718c413 100644
--- 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 600a1b54f2ae..de46dbd5b876 100644
--- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
@@ -26,13 +26,6 @@  watchdog@20620 {
 		};
 	};
 
-	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>;