]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: broadcom: stingray: Rework clock nodes
authorRob Herring (Arm) <robh@kernel.org>
Wed, 7 Jan 2026 02:09:44 +0000 (20:09 -0600)
committerFlorian Fainelli <florian.fainelli@broadcom.com>
Fri, 16 Jan 2026 21:48:57 +0000 (13:48 -0800)
The stringray-clocks.dtsi is oddly included in the middle of a bus
node and is only included in one place, so collapse it into
stingray.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.

Drop the unnecessary 1:1 fixed-factor clock providers.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20260106-dt-dtbs-broadcom-fixes-v1-5-ba45874e4553@kernel.org
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi [deleted file]
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi
deleted file mode 100644 (file)
index 10a106a..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *  BSD LICENSE
- *
- *  Copyright(c) 2016-2017 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 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-sr.h>
-
-               osc: oscillator {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <50000000>;
-               };
-
-               crmu_ref25m: crmu_ref25m {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&osc>;
-                       clock-div = <2>;
-                       clock-mult = <1>;
-               };
-
-               genpll0: genpll0@1d104 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-genpll0";
-                       reg = <0x0001d104 0x32>,
-                             <0x0001c854 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "genpll0", "clk_125m", "clk_scr",
-                                            "clk_250", "clk_pcie_axi",
-                                            "clk_paxc_axi_x2",
-                                            "clk_paxc_axi";
-               };
-
-               genpll2: genpll2@1d1ac {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-genpll2";
-                       reg = <0x0001d1ac 0x32>,
-                             <0x0001c854 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "genpll2", "clk_nic",
-                                            "clk_ts_500_ref", "clk_125_nitro",
-                                            "clk_chimp", "clk_nic_flash",
-                                            "clk_fs";
-               };
-
-               genpll3: genpll3@1d1e0 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-genpll3";
-                       reg = <0x0001d1e0 0x32>,
-                             <0x0001c854 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "genpll3", "clk_hsls",
-                                            "clk_sdio";
-               };
-
-               genpll4: genpll4@1d214 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-genpll4";
-                       reg = <0x0001d214 0x32>,
-                             <0x0001c854 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "genpll4", "clk_ccn",
-                                            "clk_tpiu_pll", "clk_noc",
-                                            "clk_chclk_fs4",
-                                            "clk_bridge_fscpu";
-               };
-
-               genpll5: genpll5@1d248 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-genpll5";
-                       reg = <0x0001d248 0x32>,
-                             <0x0001c870 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "genpll5", "clk_fs4_hf",
-                                            "clk_crypto_ae", "clk_raid_ae";
-               };
-
-               lcpll0: lcpll0@1d0c4 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-lcpll0";
-                       reg = <0x0001d0c4 0x3c>,
-                             <0x0001c870 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "lcpll0", "clk_sata_refp",
-                                            "clk_sata_refn", "clk_sata_350",
-                                            "clk_sata_500";
-               };
-
-               lcpll1: lcpll1@1d138 {
-                       #clock-cells = <1>;
-                       compatible = "brcm,sr-lcpll1";
-                       reg = <0x0001d138 0x3c>,
-                             <0x0001c870 0x4>;
-                       clocks = <&osc>;
-                       clock-output-names = "lcpll1", "clk_wan",
-                                            "clk_usb_ref",
-                                            "clk_crmu_ts";
-               };
-
-               hsls_clk: hsls_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&genpll3 1>;
-                       clock-div = <1>;
-                       clock-mult = <1>;
-               };
-
-               hsls_div2_clk: hsls_div2_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&genpll3 BCM_SR_GENPLL3_HSLS_CLK>;
-                       clock-div = <2>;
-                       clock-mult = <1>;
-
-               };
-
-               hsls_div4_clk: hsls_div4_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&genpll3 BCM_SR_GENPLL3_HSLS_CLK>;
-                       clock-div = <4>;
-                       clock-mult = <1>;
-               };
-
-               hsls_25m_clk: hsls_25m_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&crmu_ref25m>;
-                       clock-div = <1>;
-                       clock-mult = <1>;
-               };
-
-               hsls_25m_div2_clk: hsls_25m_div2_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&hsls_25m_clk>;
-                       clock-div = <2>;
-                       clock-mult = <1>;
-               };
-
-               sdio0_clk: sdio0_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&genpll3 BCM_SR_GENPLL3_SDIO_CLK>;
-                       clock-div = <1>;
-                       clock-mult = <1>;
-               };
-
-               sdio1_clk: sdio1_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-factor-clock";
-                       clocks = <&genpll3 BCM_SR_GENPLL3_SDIO_CLK>;
-                       clock-div = <1>;
-                       clock-mult = <1>;
-               };
index 857fa427e195f0a0930685db348a4e5066ae20ec..9b015b8e1bb108863d56a79ad51c712b5e74f94c 100644 (file)
@@ -30,6 +30,7 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/clock/bcm-sr.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
                reg = <0 0x60401000 0 0x38c>;
        };
 
+       osc: clock-50000000 {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <50000000>;
+       };
+
+       crmu_ref25m: hsls_25m_clk: clock-25000000 {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&osc>;
+               clock-div = <2>;
+               clock-mult = <1>;
+       };
+
+       hsls_div2_clk: hsls_div2_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&genpll3 BCM_SR_GENPLL3_HSLS_CLK>;
+               clock-div = <2>;
+               clock-mult = <1>;
+
+       };
+
+       hsls_div4_clk: hsls_div4_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&genpll3 BCM_SR_GENPLL3_HSLS_CLK>;
+               clock-div = <4>;
+               clock-mult = <1>;
+       };
+
+       hsls_25m_div2_clk: clock-12500000 {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&hsls_25m_clk>;
+               clock-div = <2>;
+               clock-mult = <1>;
+       };
+
        scr {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0 0x0 0x66400000 0x100000>;
 
-               #include "stingray-clock.dtsi"
-
                otp: otp@1c400 {
                        compatible = "brcm,ocotp-v2";
                        reg = <0x0001c400 0x68>;
                        reg = <0x0001d000 0x400>;
                };
 
+               lcpll0: clock-controller@1d0c4 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-lcpll0";
+                       reg = <0x0001d0c4 0x3c>,
+                               <0x0001c870 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "lcpll0", "clk_sata_refp",
+                                               "clk_sata_refn", "clk_sata_350",
+                                               "clk_sata_500";
+               };
+
+               genpll0: clock-controller@1d104 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-genpll0";
+                       reg = <0x0001d104 0x32>,
+                               <0x0001c854 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll0", "clk_125m", "clk_scr",
+                                               "clk_250", "clk_pcie_axi",
+                                               "clk_paxc_axi_x2",
+                                               "clk_paxc_axi";
+               };
+
+               lcpll1: clock-controller@1d138 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-lcpll1";
+                       reg = <0x0001d138 0x3c>,
+                               <0x0001c870 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "lcpll1", "clk_wan",
+                                               "clk_usb_ref",
+                                               "clk_crmu_ts";
+               };
+
+               genpll2: clock-controller@1d1ac {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-genpll2";
+                       reg = <0x0001d1ac 0x32>,
+                               <0x0001c854 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll2", "clk_nic",
+                                               "clk_ts_500_ref", "clk_125_nitro",
+                                               "clk_chimp", "clk_nic_flash",
+                                               "clk_fs";
+               };
+
+               genpll3: clock-controller@1d1e0 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-genpll3";
+                       reg = <0x0001d1e0 0x32>,
+                               <0x0001c854 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll3", "clk_hsls",
+                                               "clk_sdio";
+               };
+
+               genpll4: clock-controller@1d214 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-genpll4";
+                       reg = <0x0001d214 0x32>,
+                               <0x0001c854 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll4", "clk_ccn",
+                                               "clk_tpiu_pll", "clk_noc",
+                                               "clk_chclk_fs4",
+                                               "clk_bridge_fscpu";
+               };
+
+               genpll5: clock-controller@1d248 {
+                       #clock-cells = <1>;
+                       compatible = "brcm,sr-genpll5";
+                       reg = <0x0001d248 0x32>,
+                               <0x0001c870 0x4>;
+                       clocks = <&osc>;
+                       clock-output-names = "genpll5", "clk_fs4_hf",
+                                               "clk_crypto_ae", "clk_raid_ae";
+               };
+
                gpio_crmu: gpio@24800 {
                        compatible = "brcm,iproc-gpio";
                        reg = <0x00024800 0x4c>;
                        reg = <0x003f1000 0x100>;
                        interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
                        bus-width = <8>;
-                       clocks = <&sdio0_clk>;
+                       clocks = <&genpll3 BCM_SR_GENPLL3_SDIO_CLK>;
                        iommus = <&smmu 0x6002 0x0000>;
                        status = "disabled";
                };
                        reg = <0x003f2000 0x100>;
                        interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
                        bus-width = <8>;
-                       clocks = <&sdio1_clk>;
+                       clocks = <&genpll3 BCM_SR_GENPLL3_SDIO_CLK>;
                        iommus = <&smmu 0x6003 0x0000>;
                        status = "disabled";
                };