| Message ID | 20230916085855.28375-1-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT | expand |
> > 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>
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
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>;