58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From 81ea360a16978a4df61df9db56b171909bd659c0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Sat, 16 Sep 2023 10:30:57 +0200
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ /
|
|
MIT
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 7 +++++++
|
|
arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 7 -------
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm-ns.dtsi
|
|
+++ b/arch/arm/boot/dts/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>;
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/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>;
|