bcm53xx: backport missed DT patch cleaning up CRU block
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 8a4d4d4243
)
This commit is contained in:
parent
8035ac0195
commit
1ba74c168b
|
@ -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 {
|
|
@ -21,8 +21,8 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
|
|
||||||
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
@@ -484,7 +484,7 @@
|
@@ -485,7 +485,7 @@
|
||||||
#thermal-sensor-cells = <0>;
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
- srab: srab@18007000 {
|
- srab: srab@18007000 {
|
||||||
|
|
|
@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
+};
|
+};
|
||||||
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
+++ b/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 {
|
srab: ethernet-switch@18007000 {
|
||||||
|
|
|
@ -155,7 +155,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
label = "lan4";
|
label = "lan4";
|
||||||
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
@@ -491,6 +491,10 @@
|
@@ -492,6 +492,10 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
|
||||||
/* ports are defined in board DTS */
|
/* ports are defined in board DTS */
|
||||||
|
|
|
@ -53,7 +53,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
@@ -502,7 +502,7 @@
|
@@ -503,7 +503,7 @@
|
||||||
reg = <0x18004000 0x14>;
|
reg = <0x18004000 0x14>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
};
|
};
|
||||||
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
||||||
@@ -440,18 +440,18 @@
|
@@ -460,18 +460,18 @@
|
||||||
function = "spi";
|
function = "spi";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue