bcm53xx: backport missed DT patch cleaning up CRU block
authorRafał Miłecki <rafal@milecki.pl>
Mon, 30 Aug 2021 06:54:29 +0000 (08:54 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Sun, 4 Dec 2022 11:06:24 +0000 (12:06 +0100)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 8a4d4d4243357b28722e3327e2c7c7b4ceb288ec)

target/linux/bcm53xx/patches-5.4/034-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
target/linux/bcm53xx/patches-5.4/036-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch

diff --git a/target/linux/bcm53xx/patches-5.4/034-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch b/target/linux/bcm53xx/patches-5.4/034-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch
new file mode 100644 (file)
index 0000000..3c3db54
--- /dev/null
@@ -0,0 +1,85 @@
+From 776461b1795b4dc4084894cf53399044aafa1d21 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Wed, 11 Nov 2020 15:55:38 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Move CRU devices to the CRU node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Clocks and thermal blocks are part of the CRU ("Clock and Reset Unit" or
+"Central Resource Unit").
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm5301x.dtsi | 51 +++++++++++++++++----------------
+ 1 file changed, 26 insertions(+), 25 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -430,6 +430,26 @@
+                       #address-cells = <1>;
+                       #size-cells = <1>;
++                      lcpll0: lcpll0@100 {
++                              #clock-cells = <1>;
++                              compatible = "brcm,nsp-lcpll0";
++                              reg = <0x100 0x14>;
++                              clocks = <&osc>;
++                              clock-output-names = "lcpll0", "pcie_phy",
++                                                   "sdio", "ddr_phy";
++                      };
++
++                      genpll: genpll@140 {
++                              #clock-cells = <1>;
++                              compatible = "brcm,nsp-genpll";
++                              reg = <0x140 0x24>;
++                              clocks = <&osc>;
++                              clock-output-names = "genpll", "phy",
++                                                   "ethernetclk",
++                                                   "usbclk", "iprocfast",
++                                                   "sata1", "sata2";
++                      };
++
+                       pinctrl: pin-controller@1c0 {
+                               compatible = "brcm,bcm4708-pinmux";
+                               reg = <0x1c0 0x24>;
+@@ -456,32 +476,13 @@
+                                       function = "uart1";
+                               };
+                       };
+-              };
+-      };
+-      lcpll0: lcpll0@1800c100 {
+-              #clock-cells = <1>;
+-              compatible = "brcm,nsp-lcpll0";
+-              reg = <0x1800c100 0x14>;
+-              clocks = <&osc>;
+-              clock-output-names = "lcpll0", "pcie_phy", "sdio",
+-                                   "ddr_phy";
+-      };
+-
+-      genpll: genpll@1800c140 {
+-              #clock-cells = <1>;
+-              compatible = "brcm,nsp-genpll";
+-              reg = <0x1800c140 0x24>;
+-              clocks = <&osc>;
+-              clock-output-names = "genpll", "phy", "ethernetclk",
+-                                   "usbclk", "iprocfast", "sata1",
+-                                   "sata2";
+-      };
+-
+-      thermal: thermal@1800c2c0 {
+-              compatible = "brcm,ns-thermal";
+-              reg = <0x1800c2c0 0x10>;
+-              #thermal-sensor-cells = <0>;
++                      thermal: thermal@2c0 {
++                              compatible = "brcm,ns-thermal";
++                              reg = <0x2c0 0x10>;
++                              #thermal-sensor-cells = <0>;
++                      };
++              };
+       };
+       srab: srab@18007000 {
index 00a5d08f0db068b574d55c2d35b38ab774bc174f..b3a774e3403c887fdc163e6c3fee133b202e5e7e 100644 (file)
@@ -21,8 +21,8 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -484,7 +484,7 @@
-               #thermal-sensor-cells = <0>;
+@@ -485,7 +485,7 @@
+               };
        };
  
 -      srab: srab@18007000 {
index 044504796c8ac83022f310c67d415d099670b7bf..677e94f271c2c6dc893993d779ef8fd744cb9109 100644 (file)
@@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 +};
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -485,7 +485,7 @@
+@@ -486,7 +486,7 @@
        };
  
        srab: ethernet-switch@18007000 {
index e05ce88304846c49641263b9de1a81e4cccb6767..6e4f5f7bb8a0aad425642eb6eb3525597e5c3f60 100644 (file)
@@ -155,7 +155,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                        label = "lan4";
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -491,6 +491,10 @@
+@@ -492,6 +492,10 @@
                status = "disabled";
  
                /* ports are defined in board DTS */
index ac45409c6352cad9d61e20d8b4e3576112cf091f..48cceee743adf4add6692f65fa8d856a6bd99bfd 100644 (file)
@@ -53,7 +53,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                        #address-cells = <1>;
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -502,7 +502,7 @@
+@@ -503,7 +503,7 @@
                reg = <0x18004000 0x14>;
        };
  
index aad9aef4a3f3aaf6c815ac8fcc23e4fa291bafe6..d8a4f87c3818052037eb7dd612bceb58c71c0f2c 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        };
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -440,18 +440,18 @@
+@@ -460,18 +460,18 @@
                                        function = "spi";
                                };