[PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT

[Christian Lamparter]

On Mon, Jun 5, 2023 at 8:11 AM Rafał Miłecki <zajec5 at gmail.com> wrote:
> From: Rafał Miłecki <rafal at 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 at gmail.com>
> Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
> ---
> Florian: we need to ask & wait for Christian's Acked-by before applying
> this one.

Acked-by: Christian Lamparter <chunkeey at 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 at 13000 {
>                         reg = <0x00013000 0x1000>;
>                 };
>
> +               pcie2: pcie at 14000 {
> +                       reg = <0x00014000 0x1000>;
> +               };
> +
>                 usb2: usb2 at 21000 {
>                         reg = <0x00021000 0x1000>;
>
> @@ -274,6 +278,14 @@ gmac3: ethernet at 27000 {
>                 };
>         };
>
> +       pwm: pwm at 18002000 {
> +               compatible = "brcm,iproc-pwm";
> +               reg = <0x18002000 0x28>;
> +               clocks = <&osc>;
> +               #pwm-cells = <3>;
> +               status = "disabled";
> +       };
> +
>         mdio: mdio at 18003000 {
>                 compatible = "brcm,iproc-mdio";
>                 reg = <0x18003000 0x8>;
> @@ -299,6 +311,15 @@ ports {
>                 };
>         };
>
> +       uart2: serial at 18008000 {
> +               compatible = "ns16550a";
> +               reg = <0x18008000 0x20>;
> +               clocks = <&iprocslow>;
> +               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> +               reg-shift = <2>;
> +               status = "disabled";
> +       };
> +
>         dmu-bus at 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 at 18000000 {
> -               pcie2: pcie at 14000 {
> -                       reg = <0x00014000 0x1000>;
> -               };
> -       };
> -
> -       pwm: pwm at 18002000 {
> -               compatible = "brcm,iproc-pwm";
> -               reg = <0x18002000 0x28>;
> -               clocks = <&osc>;
> -               #pwm-cells = <3>;
> -               status = "disabled";
> -       };
> -
>         mdio-mux at 18003000 {
>                 compatible = "mdio-mux-mmioreg", "mdio-mux";
>                 mdio-parent-bus = <&mdio>;
> @@ -110,15 +96,6 @@ usb3_dmp: syscon at 18105000 {
>                 reg = <0x18105000 0x1000>;
>         };
>
> -       uart2: serial at 18008000 {
> -               compatible = "ns16550a";
> -               reg = <0x18008000 0x20>;
> -               clocks = <&iprocslow>;
> -               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> -               reg-shift = <2>;
> -               status = "disabled";
> -       };
> -
>         i2c0: i2c at 18009000 {
>                 compatible = "brcm,iproc-i2c";
>                 reg = <0x18009000 0x50>;
> --
> 2.35.3
>