[openwrt/openwrt] bcm53xx: backport missed DT patch cleaning up CRU block
LEDE Commits
lede-commits at lists.infradead.org
Sun Dec 4 03:07:35 PST 2022
rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/1ba74c168b79a14a4e9b0be7c2f145b8febfbc30
commit 1ba74c168b79a14a4e9b0be7c2f145b8febfbc30
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Aug 30 08:54:29 2021 +0200
bcm53xx: backport missed DT patch cleaning up CRU block
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
(cherry picked from commit 8a4d4d4243357b28722e3327e2c7c7b4ceb288ec)
---
...BCM5301X-Move-CRU-devices-to-the-CRU-node.patch | 85 ++++++++++++++++++++++
...BCM5301X-Update-Ethernet-switch-node-name.patch | 4 +-
...5301X-Add-a-default-compatible-for-switch.patch | 2 +-
...5301X-Provide-defaults-ports-container-no.patch | 2 +-
...001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch | 2 +-
...RM-dts-BCM5301X-Fix-pinmux-subnodes-names.patch | 2 +-
6 files changed, 91 insertions(+), 6 deletions(-)
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
index 0000000000..3c3db540d0
--- /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 at 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 at milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli at 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 at 100 {
++ #clock-cells = <1>;
++ compatible = "brcm,nsp-lcpll0";
++ reg = <0x100 0x14>;
++ clocks = <&osc>;
++ clock-output-names = "lcpll0", "pcie_phy",
++ "sdio", "ddr_phy";
++ };
++
++ genpll: genpll at 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 at 1c0 {
+ compatible = "brcm,bcm4708-pinmux";
+ reg = <0x1c0 0x24>;
+@@ -456,32 +476,13 @@
+ function = "uart1";
+ };
+ };
+- };
+- };
+
+- lcpll0: lcpll0 at 1800c100 {
+- #clock-cells = <1>;
+- compatible = "brcm,nsp-lcpll0";
+- reg = <0x1800c100 0x14>;
+- clocks = <&osc>;
+- clock-output-names = "lcpll0", "pcie_phy", "sdio",
+- "ddr_phy";
+- };
+-
+- genpll: genpll at 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 at 1800c2c0 {
+- compatible = "brcm,ns-thermal";
+- reg = <0x1800c2c0 0x10>;
+- #thermal-sensor-cells = <0>;
++ thermal: thermal at 2c0 {
++ compatible = "brcm,ns-thermal";
++ reg = <0x2c0 0x10>;
++ #thermal-sensor-cells = <0>;
++ };
++ };
+ };
+
+ srab: srab at 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 00a5d08f0d..b3a774e340 100644
--- 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 at 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 at 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 044504796c..677e94f271 100644
--- 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 at 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 at 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 e05ce88304..6e4f5f7bb8 100644
--- 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 at 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 */
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 ac45409c63..48cceee743 100644
--- 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 at 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>;
};
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 aad9aef4a3..d8a4f87c38 100644
--- 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 at 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";
};
More information about the lede-commits
mailing list