bcm53xx: backport DT changes queued for v6.7

[openwrt/openwrt.git] / target / linux / bcm53xx / patches-5.4 / 045-v6.7-0004-ARM-dts-BCM5301X-Relicense-Vivek-s-code-to-the-GPL-2.patch

diff --git a/target/linux/bcm53xx/patches-5.4/045-v6.7-0004-ARM-dts-BCM5301X-Relicense-Vivek-s-code-to-the-GPL-2.patch b/target/linux/bcm53xx/patches-5.4/045-v6.7-0004-ARM-dts-BCM5301X-Relicense-Vivek-s-code-to-the-GPL-2.patch
new file mode 100644 (file)
index 0000000..66db4a2
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/045-v6.7-0004-ARM-dts-BCM5301X-Relicense-Vivek-s-code-to-the-GPL-2.patch
@@ -0,0 +1,104 @@
+From b8d4f7c1be04d66c37c119c501c87bccc4197694 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:58:55 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Relicense Vivek'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 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>
+Acked-by: Vivek Unune <npcomplete13@gmail.com>
+Link: https://lore.kernel.org/r/20230916085855.28375-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ arch/arm/boot/dts/broadcom/bcm-ns.dtsi   | 27 ++++++++++++++++++++++++
+ arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------
+ 2 files changed, 27 insertions(+), 27 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm-ns.dtsi
++++ b/arch/arm/boot/dts/bcm-ns.dtsi
+@@ -327,6 +327,29 @@
+               #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 @@
+               brcm,nand-has-wp;
+       };
+ 
++      usb3_dmp: syscon@18105000 {
++              reg = <0x18105000 0x1000>;
++      };
++
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -62,33 +62,6 @@
+               };
+       };
+ 
+-      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>;