Skip to content

Commit b8d4f7c

Browse files
Rafał Miłeckiffainelli
authored andcommitted
ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
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 <[email protected]> Signed-off-by: Rafał Miłecki <[email protected]> Acked-by: Vivek Unune <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Florian Fainelli <[email protected]>
1 parent 81ea360 commit b8d4f7c

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

arch/arm/boot/dts/broadcom/bcm-ns.dtsi

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,29 @@
327327
#address-cells = <1>;
328328
};
329329

330+
mdio-mux@18003000 {
331+
compatible = "mdio-mux-mmioreg", "mdio-mux";
332+
mdio-parent-bus = <&mdio>;
333+
#address-cells = <1>;
334+
#size-cells = <0>;
335+
reg = <0x18003000 0x4>;
336+
mux-mask = <0x200>;
337+
338+
mdio@0 {
339+
reg = <0x0>;
340+
#address-cells = <1>;
341+
#size-cells = <0>;
342+
343+
usb3_phy: usb3-phy@10 {
344+
compatible = "brcm,ns-ax-usb3-phy";
345+
reg = <0x10>;
346+
usb3-dmp-syscon = <&usb3_dmp>;
347+
#phy-cells = <0>;
348+
status = "disabled";
349+
};
350+
};
351+
};
352+
330353
rng: rng@18004000 {
331354
compatible = "brcm,bcm5301x-rng";
332355
reg = <0x18004000 0x14>;
@@ -467,6 +490,10 @@
467490
brcm,nand-has-wp;
468491
};
469492

493+
usb3_dmp: syscon@18105000 {
494+
reg = <0x18105000 0x1000>;
495+
};
496+
470497
thermal-zones {
471498
cpu_thermal: cpu-thermal {
472499
polling-delay-passive = <0>;

arch/arm/boot/dts/broadcom/bcm5301x.dtsi

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,6 @@
6262
};
6363
};
6464

65-
mdio-mux@18003000 {
66-
compatible = "mdio-mux-mmioreg", "mdio-mux";
67-
mdio-parent-bus = <&mdio>;
68-
#address-cells = <1>;
69-
#size-cells = <0>;
70-
reg = <0x18003000 0x4>;
71-
mux-mask = <0x200>;
72-
73-
mdio@0 {
74-
reg = <0x0>;
75-
#address-cells = <1>;
76-
#size-cells = <0>;
77-
78-
usb3_phy: usb3-phy@10 {
79-
compatible = "brcm,ns-ax-usb3-phy";
80-
reg = <0x10>;
81-
usb3-dmp-syscon = <&usb3_dmp>;
82-
#phy-cells = <0>;
83-
status = "disabled";
84-
};
85-
};
86-
};
87-
88-
usb3_dmp: syscon@18105000 {
89-
reg = <0x18105000 0x1000>;
90-
};
91-
9265
i2c0: i2c@18009000 {
9366
compatible = "brcm,iproc-i2c";
9467
reg = <0x18009000 0x50>;

0 commit comments

Comments
 (0)