bcm53xx: backport missed DT patch cleaning up CRU block

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/target/linux/bcm53xx/patches-5.10/030-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch b/target/linux/bcm53xx/patches-5.10/030-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch
new file mode 100644 (file)
index 0000000..6f763a2
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.10/030-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch
@@ -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
+@@ -428,6 +428,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>;
+@@ -454,32 +474,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 {

diff --git a/target/linux/bcm53xx/patches-5.10/030-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch b/target/linux/bcm53xx/patches-5.10/030-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
index 9165572b95aa2c095c29b9d09b207fd8e527c8c1..201aba913ab4e1085df46f9e811e9c9a79f4ee84 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/030-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
+++ b/target/linux/bcm53xx/patches-5.10/030-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
@@ -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
-@@ -482,7 +482,7 @@
-               #thermal-sensor-cells = <0>;
+@@ -483,7 +483,7 @@
+               };
        };
  
 -      srab: srab@18007000 {

diff --git a/target/linux/bcm53xx/patches-5.10/030-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch b/target/linux/bcm53xx/patches-5.10/030-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
index bb1ca592a69efaa47fc98a8e1ffc490fd0c1295f..36a3b4c7284c9157d11b0f938506b395fa857c56 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/030-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
+++ b/target/linux/bcm53xx/patches-5.10/030-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
@@ -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
-@@ -483,7 +483,7 @@
+@@ -484,7 +484,7 @@
        };
  
        srab: ethernet-switch@18007000 {

diff --git a/target/linux/bcm53xx/patches-5.10/030-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch b/target/linux/bcm53xx/patches-5.10/030-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
index df868ba85fa9a87853bc9cb887e0c26ea16ce9ea..24689e998b671c7da24a6a418691e556417f483b 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/030-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
+++ b/target/linux/bcm53xx/patches-5.10/030-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
@@ -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
-@@ -489,6 +489,10 @@
+@@ -490,6 +490,10 @@
                status = "disabled";
  
                /* ports are defined in board DTS */

diff --git a/target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch b/target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
index fc8fc794658796d8ea27b20d7f3b6b6c4c263bae..3a661062b6746c4041f4ac942b0f189771f69af2 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
+++ b/target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
@@ -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
-@@ -500,7 +500,7 @@
+@@ -501,7 +501,7 @@
                reg = <0x18004000 0x14>;
        };
  

diff --git a/target/linux/bcm53xx/patches-5.10/032-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch b/target/linux/bcm53xx/patches-5.10/032-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
index ebc06bd1638b0405003aa2bc0a664d512b42368e..1a342474a4705cd88e7a1cbc4c2ac12d5917377d 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/032-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
+++ b/target/linux/bcm53xx/patches-5.10/032-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
@@ -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
-@@ -438,18 +438,18 @@
+@@ -458,18 +458,18 @@
                                        function = "spi";
                                };
  

diff --git a/target/linux/bcm53xx/patches-5.10/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch b/target/linux/bcm53xx/patches-5.10/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
index e1a2d4ab9b854e0971b9cc2c9d9d892384a809f1..ca94f46652d06e7cc1dd54f3f0cf47f7ab2e9aa5 100644 (file)
--- a/target/linux/bcm53xx/patches-5.10/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
+++ b/target/linux/bcm53xx/patches-5.10/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
@@ -9,19 +9,21 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -422,16 +422,12 @@
+@@ -422,7 +422,7 @@
                #size-cells = <1>;
  
                cru@100 {
 -                      compatible = "simple-bus";
 +                      compatible = "syscon", "simple-mfd";
                        reg = <0x100 0x1a4>;
--                      ranges;
--                      #address-cells = <1>;
--                      #size-cells = <1>;
+                       ranges;
+                       #address-cells = <1>;
+@@ -448,10 +448,9 @@
+                                                    "sata1", "sata2";
+                       };
  
 -                      pinctrl: pin-controller@1c0 {
-+                      pinctrl: pinctrl {
++                      pinctrl: pin-controller {
                                compatible = "brcm,bcm4708-pinmux";
 -                              reg = <0x1c0 0x24>;
 -                              reg-names = "cru_gpio_control";

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..6f763a2
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/034-v5.11-0007-ARM-dts-BCM5301X-Move-CRU-devices-to-the-CRU-node.patch
@@ -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
+@@ -428,6 +428,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>;
+@@ -454,32 +474,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 {

diff --git a/target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch b/target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
index 9165572b95aa2c095c29b9d09b207fd8e527c8c1..201aba913ab4e1085df46f9e811e9c9a79f4ee84 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
+++ b/target/linux/bcm53xx/patches-5.4/034-v5.11-0010-ARM-dts-BCM5301X-Update-Ethernet-switch-node-name.patch
@@ -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
-@@ -482,7 +482,7 @@
-               #thermal-sensor-cells = <0>;
+@@ -483,7 +483,7 @@
+               };
        };
  
 -      srab: srab@18007000 {

diff --git a/target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch b/target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
index bb1ca592a69efaa47fc98a8e1ffc490fd0c1295f..36a3b4c7284c9157d11b0f938506b395fa857c56 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
+++ b/target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
@@ -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
-@@ -483,7 +483,7 @@
+@@ -484,7 +484,7 @@
        };
  
        srab: ethernet-switch@18007000 {

diff --git a/target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch b/target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
index df868ba85fa9a87853bc9cb887e0c26ea16ce9ea..24689e998b671c7da24a6a418691e556417f483b 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
+++ b/target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
@@ -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
-@@ -489,6 +489,10 @@
+@@ -490,6 +490,10 @@
                status = "disabled";
  
                /* ports are defined in board DTS */

diff --git a/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch b/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
index fc8fc794658796d8ea27b20d7f3b6b6c4c263bae..3a661062b6746c4041f4ac942b0f189771f69af2 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
+++ b/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch
@@ -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
-@@ -500,7 +500,7 @@
+@@ -501,7 +501,7 @@
                reg = <0x18004000 0x14>;
        };
  

diff --git a/target/linux/bcm53xx/patches-5.4/036-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch b/target/linux/bcm53xx/patches-5.4/036-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
index ebc06bd1638b0405003aa2bc0a664d512b42368e..1a342474a4705cd88e7a1cbc4c2ac12d5917377d 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/036-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
+++ b/target/linux/bcm53xx/patches-5.4/036-v5.14-0002-ARM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch
@@ -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
-@@ -438,18 +438,18 @@
+@@ -458,18 +458,18 @@
                                        function = "spi";
                                };
  

diff --git a/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch b/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
index e1a2d4ab9b854e0971b9cc2c9d9d892384a809f1..ca94f46652d06e7cc1dd54f3f0cf47f7ab2e9aa5 100644 (file)
--- a/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
+++ b/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
@@ -9,19 +9,21 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -422,16 +422,12 @@
+@@ -422,7 +422,7 @@
                #size-cells = <1>;
  
                cru@100 {
 -                      compatible = "simple-bus";
 +                      compatible = "syscon", "simple-mfd";
                        reg = <0x100 0x1a4>;
--                      ranges;
--                      #address-cells = <1>;
--                      #size-cells = <1>;
+                       ranges;
+                       #address-cells = <1>;
+@@ -448,10 +448,9 @@
+                                                    "sata1", "sata2";
+                       };
  
 -                      pinctrl: pin-controller@1c0 {
-+                      pinctrl: pinctrl {
++                      pinctrl: pin-controller {
                                compatible = "brcm,bcm4708-pinmux";
 -                              reg = <0x1c0 0x24>;
 -                              reg-names = "cru_gpio_control";