* [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
@ 2023-09-16 8:30 Rafał Miłecki
2023-09-22 9:18 ` Felix Fietkau
2023-10-02 23:21 ` Florian Fainelli
0 siblings, 2 replies; 3+ messages in thread
From: Rafał Miłecki @ 2023-09-16 8:30 UTC (permalink / raw)
To: Florian Fainelli
Cc: Hauke Mehrtens, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
linux-arm-kernel, devicetree, bcm-kernel-feedback-list,
Rafał Miłecki, Felix Fietkau
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(-)
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>;
--
2.35.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
2023-09-16 8:30 [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT Rafał Miłecki
@ 2023-09-22 9:18 ` Felix Fietkau
2023-10-02 23:21 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Felix Fietkau @ 2023-09-22 9:18 UTC (permalink / raw)
To: Rafał Miłecki, Florian Fainelli
Cc: Hauke Mehrtens, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
linux-arm-kernel, devicetree, bcm-kernel-feedback-list,
Rafał Miłecki
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
2023-09-16 8:30 [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT Rafał Miłecki
2023-09-22 9:18 ` Felix Fietkau
@ 2023-10-02 23:21 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2023-10-02 23:21 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Rafał Miłecki,
Florian Fainelli
Cc: Florian Fainelli, Hauke Mehrtens, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
Rafał Miłecki, Felix Fietkau
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
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
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-02 23:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-16 8:30 [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT Rafał Miłecki
2023-09-22 9:18 ` Felix Fietkau
2023-10-02 23:21 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).