* [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
@ 2023-06-05 6:10 Rafał Miłecki
2023-06-05 21:23 ` Christian Lamparter
2023-06-06 16:47 ` Florian Fainelli
0 siblings, 2 replies; 3+ messages in thread
From: Rafał Miłecki @ 2023-06-05 6:10 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, Christian Lamparter
From: Rafał Miłecki <rafal@milecki.pl>
Move code added by Christian to the bcm-ns.dtsi which uses dual
licensing. That syncs more Northstar code to be based on the same
licensing schema.
Cc: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
Florian: we need to ask & wait for Christian's Acked-by before applying
this one.
---
arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++
arch/arm/boot/dts/bcm5301x.dtsi | 23 -----------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi
index 793891f1f260..d9455b33adee 100644
--- a/arch/arm/boot/dts/bcm-ns.dtsi
+++ b/arch/arm/boot/dts/bcm-ns.dtsi
@@ -182,6 +182,10 @@ pcie1: pcie@13000 {
reg = <0x00013000 0x1000>;
};
+ pcie2: pcie@14000 {
+ reg = <0x00014000 0x1000>;
+ };
+
usb2: usb2@21000 {
reg = <0x00021000 0x1000>;
@@ -274,6 +278,14 @@ gmac3: ethernet@27000 {
};
};
+ pwm: pwm@18002000 {
+ compatible = "brcm,iproc-pwm";
+ reg = <0x18002000 0x28>;
+ clocks = <&osc>;
+ #pwm-cells = <3>;
+ status = "disabled";
+ };
+
mdio: mdio@18003000 {
compatible = "brcm,iproc-mdio";
reg = <0x18003000 0x8>;
@@ -299,6 +311,15 @@ ports {
};
};
+ uart2: serial@18008000 {
+ compatible = "ns16550a";
+ reg = <0x18008000 0x20>;
+ clocks = <&iprocslow>;
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+ reg-shift = <2>;
+ status = "disabled";
+ };
+
dmu-bus@1800c000 {
compatible = "simple-bus";
ranges = <0 0x1800c000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 0f40812eb5a4..600a1b54f2ae 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -69,20 +69,6 @@ periph_clk: periph_clk {
};
};
- axi@18000000 {
- pcie2: pcie@14000 {
- reg = <0x00014000 0x1000>;
- };
- };
-
- pwm: pwm@18002000 {
- compatible = "brcm,iproc-pwm";
- reg = <0x18002000 0x28>;
- clocks = <&osc>;
- #pwm-cells = <3>;
- status = "disabled";
- };
-
mdio-mux@18003000 {
compatible = "mdio-mux-mmioreg", "mdio-mux";
mdio-parent-bus = <&mdio>;
@@ -110,15 +96,6 @@ usb3_dmp: syscon@18105000 {
reg = <0x18105000 0x1000>;
};
- uart2: serial@18008000 {
- compatible = "ns16550a";
- reg = <0x18008000 0x20>;
- clocks = <&iprocslow>;
- interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
- reg-shift = <2>;
- status = "disabled";
- };
-
i2c0: i2c@18009000 {
compatible = "brcm,iproc-i2c";
reg = <0x18009000 0x50>;
--
2.35.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
2023-06-05 6:10 [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT Rafał Miłecki
@ 2023-06-05 21:23 ` Christian Lamparter
2023-06-06 16:47 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Christian Lamparter @ 2023-06-05 21:23 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Florian Fainelli, Hauke Mehrtens, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
bcm-kernel-feedback-list, Rafał Miłecki
On Mon, Jun 5, 2023 at 8:11 AM Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> Move code added by Christian to the bcm-ns.dtsi which uses dual
> licensing. That syncs more Northstar code to be based on the same
> licensing schema.
>
> Cc: Christian Lamparter <chunkeey@gmail.com>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> Florian: we need to ask & wait for Christian's Acked-by before applying
> this one.
Acked-by: Christian Lamparter <chunkeey@gmail.com>
> ---
> arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++
> arch/arm/boot/dts/bcm5301x.dtsi | 23 -----------------------
> 2 files changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi
> index 793891f1f260..d9455b33adee 100644
> --- a/arch/arm/boot/dts/bcm-ns.dtsi
> +++ b/arch/arm/boot/dts/bcm-ns.dtsi
> @@ -182,6 +182,10 @@ pcie1: pcie@13000 {
> reg = <0x00013000 0x1000>;
> };
>
> + pcie2: pcie@14000 {
> + reg = <0x00014000 0x1000>;
> + };
> +
> usb2: usb2@21000 {
> reg = <0x00021000 0x1000>;
>
> @@ -274,6 +278,14 @@ gmac3: ethernet@27000 {
> };
> };
>
> + pwm: pwm@18002000 {
> + compatible = "brcm,iproc-pwm";
> + reg = <0x18002000 0x28>;
> + clocks = <&osc>;
> + #pwm-cells = <3>;
> + status = "disabled";
> + };
> +
> mdio: mdio@18003000 {
> compatible = "brcm,iproc-mdio";
> reg = <0x18003000 0x8>;
> @@ -299,6 +311,15 @@ ports {
> };
> };
>
> + uart2: serial@18008000 {
> + compatible = "ns16550a";
> + reg = <0x18008000 0x20>;
> + clocks = <&iprocslow>;
> + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> + reg-shift = <2>;
> + status = "disabled";
> + };
> +
> dmu-bus@1800c000 {
> compatible = "simple-bus";
> ranges = <0 0x1800c000 0x1000>;
> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
> index 0f40812eb5a4..600a1b54f2ae 100644
> --- a/arch/arm/boot/dts/bcm5301x.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
> @@ -69,20 +69,6 @@ periph_clk: periph_clk {
> };
> };
>
> - axi@18000000 {
> - pcie2: pcie@14000 {
> - reg = <0x00014000 0x1000>;
> - };
> - };
> -
> - pwm: pwm@18002000 {
> - compatible = "brcm,iproc-pwm";
> - reg = <0x18002000 0x28>;
> - clocks = <&osc>;
> - #pwm-cells = <3>;
> - status = "disabled";
> - };
> -
> mdio-mux@18003000 {
> compatible = "mdio-mux-mmioreg", "mdio-mux";
> mdio-parent-bus = <&mdio>;
> @@ -110,15 +96,6 @@ usb3_dmp: syscon@18105000 {
> reg = <0x18105000 0x1000>;
> };
>
> - uart2: serial@18008000 {
> - compatible = "ns16550a";
> - reg = <0x18008000 0x20>;
> - clocks = <&iprocslow>;
> - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> - reg-shift = <2>;
> - status = "disabled";
> - };
> -
> i2c0: i2c@18009000 {
> compatible = "brcm,iproc-i2c";
> reg = <0x18009000 0x50>;
> --
> 2.35.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
2023-06-05 6:10 [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT Rafał Miłecki
2023-06-05 21:23 ` Christian Lamparter
@ 2023-06-06 16:47 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2023-06-06 16:47 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Rafał Miłecki
Cc: Florian Fainelli, Hauke Mehrtens, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
Rafał Miłecki, Christian Lamparter
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
From: Florian Fainelli <f.fainelli@gmail.com>
On Mon, 5 Jun 2023 08:10:49 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> Move code added by Christian to the bcm-ns.dtsi which uses dual
> licensing. That syncs more Northstar code to be based on the same
> licensing schema.
>
> Cc: Christian Lamparter <chunkeey@gmail.com>
> 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-06-06 16:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-05 6:10 [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT Rafał Miłecki
2023-06-05 21:23 ` Christian Lamparter
2023-06-06 16:47 ` 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).