devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
@ 2023-09-16  8:58 Rafał Miłecki
  2023-09-22 19:16 ` Vivek Unune
  2023-10-02 23:22 ` Florian Fainelli
  0 siblings, 2 replies; 3+ messages in thread
From: Rafał Miłecki @ 2023-09-16  8:58 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, Vivek Unune

From: Rafał Miłecki <rafal@milecki.pl>

Move code added by Vivek 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 37f6130ec39f ("ARM: dts: BCM5301X:
Make USB 3.0 PHY use MDIO PHY driver").

Cc: Vivek Unune <npcomplete13@gmail.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
Vivek: can you send your Acked-by for this patch, please?
---
 arch/arm/boot/dts/broadcom/bcm-ns.dtsi   | 27 ++++++++++++++++++++++++
 arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
index f0f3a718c413..d0d5f7e52a91 100644
--- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
@@ -327,6 +327,29 @@ mdio: mdio@18003000 {
 		#address-cells = <1>;
 	};
 
+	mdio-mux@18003000 {
+		compatible = "mdio-mux-mmioreg", "mdio-mux";
+		mdio-parent-bus = <&mdio>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x18003000 0x4>;
+		mux-mask = <0x200>;
+
+		mdio@0 {
+			reg = <0x0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			usb3_phy: usb3-phy@10 {
+				compatible = "brcm,ns-ax-usb3-phy";
+				reg = <0x10>;
+				usb3-dmp-syscon = <&usb3_dmp>;
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+		};
+	};
+
 	rng: rng@18004000 {
 		compatible = "brcm,bcm5301x-rng";
 		reg = <0x18004000 0x14>;
@@ -467,6 +490,10 @@ nand_controller: nand-controller@18028000 {
 		brcm,nand-has-wp;
 	};
 
+	usb3_dmp: syscon@18105000 {
+		reg = <0x18105000 0x1000>;
+	};
+
 	thermal-zones {
 		cpu_thermal: cpu-thermal {
 			polling-delay-passive = <0>;
diff --git a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
index de46dbd5b876..f06a178a9240 100644
--- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
@@ -62,33 +62,6 @@ periph_clk: periph_clk {
 		};
 	};
 
-	mdio-mux@18003000 {
-		compatible = "mdio-mux-mmioreg", "mdio-mux";
-		mdio-parent-bus = <&mdio>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0x18003000 0x4>;
-		mux-mask = <0x200>;
-
-		mdio@0 {
-			reg = <0x0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			usb3_phy: usb3-phy@10 {
-				compatible = "brcm,ns-ax-usb3-phy";
-				reg = <0x10>;
-				usb3-dmp-syscon = <&usb3_dmp>;
-				#phy-cells = <0>;
-				status = "disabled";
-			};
-		};
-	};
-
-	usb3_dmp: syscon@18105000 {
-		reg = <0x18105000 0x1000>;
-	};
-
 	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 Vivek's code to the GPL 2.0+ / MIT
  2023-09-16  8:58 [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT Rafał Miłecki
@ 2023-09-22 19:16 ` Vivek Unune
  2023-10-02 23:22 ` Florian Fainelli
  1 sibling, 0 replies; 3+ messages in thread
From: Vivek Unune @ 2023-09-22 19:16 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

>
> From: Rafał Miłecki <rafal@milecki.pl>
>
> Move code added by Vivek 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 37f6130ec39f ("ARM: dts: BCM5301X:
> Make USB 3.0 PHY use MDIO PHY driver").
>
> Cc: Vivek Unune <npcomplete13@gmail.com>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> Vivek: can you send your Acked-by for this patch, please?
> ---
>  arch/arm/boot/dts/broadcom/bcm-ns.dtsi   | 27 ++++++++++++++++++++++++
>  arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------
>  2 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
> index f0f3a718c413..d0d5f7e52a91 100644
> --- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
> +++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
> @@ -327,6 +327,29 @@ mdio: mdio@18003000 {
>                 #address-cells = <1>;
>         };
>
> +       mdio-mux@18003000 {
> +               compatible = "mdio-mux-mmioreg", "mdio-mux";
> +               mdio-parent-bus = <&mdio>;
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               reg = <0x18003000 0x4>;
> +               mux-mask = <0x200>;
> +
> +               mdio@0 {
> +                       reg = <0x0>;
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +
> +                       usb3_phy: usb3-phy@10 {
> +                               compatible = "brcm,ns-ax-usb3-phy";
> +                               reg = <0x10>;
> +                               usb3-dmp-syscon = <&usb3_dmp>;
> +                               #phy-cells = <0>;
> +                               status = "disabled";
> +                       };
> +               };
> +       };
> +
>         rng: rng@18004000 {
>                 compatible = "brcm,bcm5301x-rng";
>                 reg = <0x18004000 0x14>;
> @@ -467,6 +490,10 @@ nand_controller: nand-controller@18028000 {
>                 brcm,nand-has-wp;
>         };
>
> +       usb3_dmp: syscon@18105000 {
> +               reg = <0x18105000 0x1000>;
> +       };
> +
>         thermal-zones {
>                 cpu_thermal: cpu-thermal {
>                         polling-delay-passive = <0>;
> diff --git a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
> index de46dbd5b876..f06a178a9240 100644
> --- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
> +++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
> @@ -62,33 +62,6 @@ periph_clk: periph_clk {
>                 };
>         };
>
> -       mdio-mux@18003000 {
> -               compatible = "mdio-mux-mmioreg", "mdio-mux";
> -               mdio-parent-bus = <&mdio>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               reg = <0x18003000 0x4>;
> -               mux-mask = <0x200>;
> -
> -               mdio@0 {
> -                       reg = <0x0>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -
> -                       usb3_phy: usb3-phy@10 {
> -                               compatible = "brcm,ns-ax-usb3-phy";
> -                               reg = <0x10>;
> -                               usb3-dmp-syscon = <&usb3_dmp>;
> -                               #phy-cells = <0>;
> -                               status = "disabled";
> -                       };
> -               };
> -       };
> -
> -       usb3_dmp: syscon@18105000 {
> -               reg = <0x18105000 0x1000>;
> -       };
> -
>         i2c0: i2c@18009000 {
>                 compatible = "brcm,iproc-i2c";
>                 reg = <0x18009000 0x50>;
> --
> 2.35.3
>
Acked-by: Vivek Unune <npcomplete13@gmail.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
  2023-09-16  8:58 [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT Rafał Miłecki
  2023-09-22 19:16 ` Vivek Unune
@ 2023-10-02 23:22 ` Florian Fainelli
  1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2023-10-02 23:22 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, Vivek Unune

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

From: Florian Fainelli <f.fainelli@gmail.com>

On Sat, 16 Sep 2023 10:58:55 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Move code added by Vivek 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 37f6130ec39f ("ARM: dts: BCM5301X:
> Make USB 3.0 PHY use MDIO PHY driver").
> 
> Cc: Vivek Unune <npcomplete13@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-10-02 23:22 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:58 [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT Rafał Miłecki
2023-09-22 19:16 ` Vivek Unune
2023-10-02 23:22 ` 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).