arm64: dts: broadcom: northstar2: Rework clock nodes

The nd2-clocks.dtsi is oddly included in the middle of a bus node and is
only included in one place, so collapse it into ns2.dtsi. Move the fixed
and fixed-factor clock nodes to the root as they are not part of the
bus. Rename the node names to use preferred names.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20260106-dt-dtbs-broadcom-fixes-v1-10-ba45874e4553@kernel.org
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi
deleted file mode 100644 (file)
index 99009fd..0000000
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  BSD LICENSE
- *
- *  Copyright (c) 2016 Broadcom.  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in
- *      the documentation and/or other materials provided with the
- *      distribution.
- *    * Neither the name of Broadcom Corporation nor the names of its
- *      contributors may be used to endorse or promote products derived
- *      from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <dt-bindings/clock/bcm-ns2.h>
-
-       osc: oscillator {
-               #clock-cells = <0>;
-               compatible = "fixed-clock";
-               clock-frequency = <25000000>;
-       };
-
-       lcpll_ddr: lcpll_ddr@6501d058 {
-               #clock-cells = <1>;
-               compatible = "brcm,ns2-lcpll-ddr";
-               reg = <0x6501d058 0x20>,
-                     <0x6501c020 0x4>,
-                     <0x6501d04c 0x4>;
-               clocks = <&osc>;
-               clock-output-names = "lcpll_ddr", "pcie_sata_usb",
-                                    "ddr", "ddr_ch2_unused",
-                                    "ddr_ch3_unused", "ddr_ch4_unused",
-                                    "ddr_ch5_unused";
-       };
-
-       lcpll_ports: lcpll_ports@6501d078 {
-               #clock-cells = <1>;
-               compatible = "brcm,ns2-lcpll-ports";
-               reg = <0x6501d078 0x20>,
-                     <0x6501c020 0x4>,
-                     <0x6501d054 0x4>;
-               clocks = <&osc>;
-               clock-output-names = "lcpll_ports", "wan", "rgmii",
-                                    "ports_ch2_unused",
-                                    "ports_ch3_unused",
-                                    "ports_ch4_unused",
-                                    "ports_ch5_unused";
-       };
-
-       genpll_scr: genpll_scr@6501d098 {
-               #clock-cells = <1>;
-               compatible = "brcm,ns2-genpll-scr";
-               reg = <0x6501d098 0x32>,
-                     <0x6501c020 0x4>,
-                     <0x6501d044 0x4>;
-               clocks = <&osc>;
-               clock-output-names = "genpll_scr", "scr", "fs",
-                                    "audio_ref", "scr_ch3_unused",
-                                    "scr_ch4_unused", "scr_ch5_unused";
-       };
-
-       iprocmed: iprocmed {
-               #clock-cells = <0>;
-               compatible = "fixed-factor-clock";
-               clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
-               clock-div = <2>;
-               clock-mult = <1>;
-       };
-
-       iprocslow: iprocslow {
-               #clock-cells = <0>;
-               compatible = "fixed-factor-clock";
-               clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
-               clock-div = <4>;
-               clock-mult = <1>;
-       };
-
-       genpll_sw: genpll_sw@6501d0c4 {
-               #clock-cells = <1>;
-               compatible = "brcm,ns2-genpll-sw";
-               reg = <0x6501d0c4 0x32>,
-                     <0x6501c020 0x4>,
-                     <0x6501d044 0x4>;
-               clocks = <&osc>;
-               clock-output-names = "genpll_sw", "rpe", "250", "nic",
-                                    "chimp", "port", "sdio";
-       };

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
index 0de9d6265701601d0319be8235783d425e3c442e..c9bf77b3566ee7bb8491462a15c08054c3308f5d 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
@@ -113,6 +113,28 @@
                                     <&A57_3>;
        };
 
+       osc: clock-25000000 {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <25000000>;
+       };
+
+       iprocmed: iprocmed {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
+               clock-div = <2>;
+               clock-mult = <1>;
+       };
+
+       iprocslow: iprocslow {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
+               clock-div = <4>;
+               clock-mult = <1>;
+       };
+
        pcie0: pcie@20020000 {
                compatible = "brcm,iproc-pcie";
                reg = <0 0x20020000 0 0x1000>;
@@ -197,8 +219,6 @@
                #size-cells = <1>;
                ranges = <0 0 0 0xffffffff>;
 
-               #include "ns2-clock.dtsi"
-
                enet: ethernet@61000000 {
                        compatible = "brcm,ns2-amac";
                        reg = <0x61000000 0x1000>,
@@ -334,6 +354,55 @@
                        #iommu-cells = <1>;
                };
 
+               lcpll_ddr: clock-controller@6501d058 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,ns2-lcpll-ddr";
+                       reg = <0x6501d058 0x20>,
+                             <0x6501c020 0x4>,
+                             <0x6501d04c 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "lcpll_ddr", "pcie_sata_usb",
+                                            "ddr", "ddr_ch2_unused",
+                                            "ddr_ch3_unused", "ddr_ch4_unused",
+                                            "ddr_ch5_unused";
+               };
+
+               lcpll_ports: clock-controller@6501d078 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,ns2-lcpll-ports";
+                       reg = <0x6501d078 0x20>,
+                             <0x6501c020 0x4>,
+                             <0x6501d054 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "lcpll_ports", "wan", "rgmii",
+                                            "ports_ch2_unused",
+                                            "ports_ch3_unused",
+                                            "ports_ch4_unused",
+                                            "ports_ch5_unused";
+               };
+
+               genpll_scr: clock-controller@6501d098 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,ns2-genpll-scr";
+                       reg = <0x6501d098 0x32>,
+                             <0x6501c020 0x4>,
+                             <0x6501d044 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll_scr", "scr", "fs",
+                                            "audio_ref", "scr_ch3_unused",
+                                            "scr_ch4_unused", "scr_ch5_unused";
+               };
+
+               genpll_sw: clock-controller@6501d0c4 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,ns2-genpll-sw";
+                       reg = <0x6501d0c4 0x32>,
+                             <0x6501c020 0x4>,
+                             <0x6501d044 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll_sw", "rpe", "250", "nic",
+                                            "chimp", "port", "sdio";
+               };
                pinctrl: pinctrl@6501d130 {
                        compatible = "brcm,ns2-pinmux";
                        reg = <0x6501d130 0x08>,