137 lines
3.0 KiB
Diff
137 lines
3.0 KiB
Diff
From 916553449561c4f0b61c71b751b7bb583f5dddd4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Wed, 3 May 2023 14:16:11 +0200
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Relicense Florian's code to the GPL 2.0+
|
|
/ MIT
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
All BCM5301X device DTS files use dual licensing. Try the same for SoC.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Link: https://lore.kernel.org/r/20230503121611.1629-2-zajec5@gmail.com
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm-ns.dtsi | 36 ++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/bcm5301x.dtsi | 39 ---------------------------------
|
|
2 files changed, 36 insertions(+), 39 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm-ns.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm-ns.dtsi
|
|
@@ -19,6 +19,8 @@
|
|
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ interrupt-controller;
|
|
+ #interrupt-cells = <2>;
|
|
};
|
|
|
|
pcie0: pcie@12000 {
|
|
@@ -109,6 +111,22 @@
|
|
};
|
|
};
|
|
};
|
|
+
|
|
+ gmac0: ethernet@24000 {
|
|
+ reg = <0x24000 0x800>;
|
|
+ };
|
|
+
|
|
+ gmac1: ethernet@25000 {
|
|
+ reg = <0x25000 0x800>;
|
|
+ };
|
|
+
|
|
+ gmac2: ethernet@26000 {
|
|
+ reg = <0x26000 0x800>;
|
|
+ };
|
|
+
|
|
+ gmac3: ethernet@27000 {
|
|
+ reg = <0x27000 0x800>;
|
|
+ };
|
|
};
|
|
|
|
mdio: mdio@18003000 {
|
|
@@ -118,6 +136,24 @@
|
|
#address-cells = <1>;
|
|
};
|
|
|
|
+ rng: rng@18004000 {
|
|
+ compatible = "brcm,bcm5301x-rng";
|
|
+ reg = <0x18004000 0x14>;
|
|
+ };
|
|
+
|
|
+ srab: ethernet-switch@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@1800c000 {
|
|
compatible = "simple-bus";
|
|
ranges = <0 0x1800c000 0x1000>;
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -218,30 +218,9 @@
|
|
<0x00028000 6 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
|
|
<0x00028000 7 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
|
- chipcommon@0 {
|
|
- interrupt-controller;
|
|
- #interrupt-cells = <2>;
|
|
- };
|
|
-
|
|
pcie2: pcie@14000 {
|
|
reg = <0x00014000 0x1000>;
|
|
};
|
|
-
|
|
- gmac0: ethernet@24000 {
|
|
- reg = <0x24000 0x800>;
|
|
- };
|
|
-
|
|
- gmac1: ethernet@25000 {
|
|
- reg = <0x25000 0x800>;
|
|
- };
|
|
-
|
|
- gmac2: ethernet@26000 {
|
|
- reg = <0x26000 0x800>;
|
|
- };
|
|
-
|
|
- gmac3: ethernet@27000 {
|
|
- reg = <0x27000 0x800>;
|
|
- };
|
|
};
|
|
|
|
pwm: pwm@18002000 {
|
|
@@ -322,24 +301,6 @@
|
|
};
|
|
};
|
|
|
|
- srab: ethernet-switch@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@18004000 {
|
|
- compatible = "brcm,bcm5301x-rng";
|
|
- reg = <0x18004000 0x14>;
|
|
- };
|
|
-
|
|
nand_controller: nand-controller@18028000 {
|
|
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
|
|
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
|