Skip to content

Commit

Permalink
ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
Browse files Browse the repository at this point in the history
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 37f6130 ("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>
  • Loading branch information
Rafał Miłecki authored and Florian Fainelli committed Oct 23, 2023
1 parent 81ea360 commit b8d4f7c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
27 changes: 27 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm-ns.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down
27 changes: 0 additions & 27 deletions arch/arm/boot/dts/broadcom/bcm5301x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit b8d4f7c

Please sign in to comment.