Skip to content

Commit 9587fe4

Browse files
arndbarndb
committed
Merge tag 'arm-soc/for-6.20/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64-based SoCs DT changes for 6.20, please pull the following: - Peter enables the RNG on 2712 (Raspberry Pi 5) - Stanimir adds the watchdog DT node on 2712 - Rob removes undocumneted nodes, reworks clock nodes, fixes the "simple-bus" node names, and cleans up additional properties and nodes for all Broadcom ARM64-based SoCs * tag 'arm-soc/for-6.20/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: bcm4906-netgear-r8000p: Drop unnecessary "ranges" in partition node arm64: dts: broadcom: northstar2: Drop "arm,cci-400-pmu" fallback compatible arm64: dts: broadcom: northstar2: Drop QSPI "clock-names" arm64: dts: broadcom: northstar2: Drop unused and undocumented "brcm,pcie-ob-oarr-size" properties arm64: dts: broadcom: northstar2: Rework clock nodes arm64: dts: broadcom: ns2-svk: Use non-deprecated at25 properties arm64: dts: broadcom: Use preferred node names arm64: dts: broadcom: stingray: Move raid nodes out of bus arm64: dts: broadcom: stingray: Fix 'simple-bus' node names arm64: dts: broadcom: stingray: Rework clock nodes arm64: dts: broadcom: Remove unused and undocumented nodes arm64: dts: broadcom: bcm2712: Add watchdog DT node arm64: dts: broadcom: bcm2712: Enable RNG Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b2a2963 + a95e1d8 commit 9587fe4

12 files changed

Lines changed: 275 additions & 419 deletions

File tree

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@
146146
partition@0 {
147147
label = "cferom";
148148
reg = <0x0 0x100000>;
149-
#address-cells = <1>;
150-
#size-cells = <1>;
151-
ranges = <0 0x0 0x100000>;
152149

153150
nvmem-layout {
154151
compatible = "fixed-layout";

‎arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -106,34 +106,18 @@
106106

107107
&ssp0 {
108108
status = "okay";
109-
110-
slic@0 {
111-
compatible = "silabs,si3226x";
112-
reg = <0>;
113-
spi-max-frequency = <5000000>;
114-
spi-cpha;
115-
spi-cpol;
116-
pl022,interface = <0>;
117-
pl022,slave-tx-disable = <0>;
118-
pl022,com-mode = <0>;
119-
pl022,rx-level-trig = <1>;
120-
pl022,tx-level-trig = <1>;
121-
pl022,ctrl-len = <11>;
122-
pl022,wait-state = <0>;
123-
pl022,duplex = <0>;
124-
};
125109
};
126110

127111
&ssp1 {
128112
status = "okay";
129113

130-
at25@0 {
114+
eeprom@0 {
131115
compatible = "atmel,at25";
132116
reg = <0>;
133117
spi-max-frequency = <5000000>;
134-
at25,byte-len = <0x8000>;
135-
at25,addr-mode = <2>;
136-
at25,page-size = <64>;
118+
size = <0x8000>;
119+
address-width = <16>;
120+
pagesize = <64>;
137121
spi-cpha;
138122
spi-cpol;
139123
pl022,interface = <0>;
@@ -167,7 +151,7 @@
167151
};
168152

169153
&nand {
170-
nandcs@0 {
154+
nand@0 {
171155
compatible = "brcm,nandcs";
172156
reg = <0>;
173157
nand-ecc-mode = "hw";

‎arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
};
7575

7676
&nand {
77-
nandcs@0 {
77+
nand@0 {
7878
compatible = "brcm,nandcs";
7979
reg = <0>;
8080
nand-ecc-mode = "hw";

‎arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi‎

Lines changed: 76 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,28 @@
113113
<&A57_3>;
114114
};
115115

116+
osc: clock-25000000 {
117+
#clock-cells = <0>;
118+
compatible = "fixed-clock";
119+
clock-frequency = <25000000>;
120+
};
121+
122+
iprocmed: iprocmed {
123+
#clock-cells = <0>;
124+
compatible = "fixed-factor-clock";
125+
clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
126+
clock-div = <2>;
127+
clock-mult = <1>;
128+
};
129+
130+
iprocslow: iprocslow {
131+
#clock-cells = <0>;
132+
compatible = "fixed-factor-clock";
133+
clocks = <&genpll_scr BCM_NS2_GENPLL_SCR_SCR_CLK>;
134+
clock-div = <4>;
135+
clock-mult = <1>;
136+
};
137+
116138
pcie0: pcie@20020000 {
117139
compatible = "brcm,iproc-pcie";
118140
reg = <0 0x20020000 0 0x1000>;
@@ -132,7 +154,6 @@
132154
ranges = <0x83000000 0 0x00000000 0 0x00000000 0 0x20000000>;
133155

134156
brcm,pcie-ob;
135-
brcm,pcie-ob-oarr-size;
136157
brcm,pcie-ob-axi-offset = <0x00000000>;
137158

138159
status = "disabled";
@@ -162,7 +183,6 @@
162183
ranges = <0x83000000 0 0x00000000 0 0x30000000 0 0x20000000>;
163184

164185
brcm,pcie-ob;
165-
brcm,pcie-ob-oarr-size;
166186
brcm,pcie-ob-axi-offset = <0x30000000>;
167187

168188
status = "disabled";
@@ -197,8 +217,6 @@
197217
#size-cells = <1>;
198218
ranges = <0 0 0 0xffffffff>;
199219

200-
#include "ns2-clock.dtsi"
201-
202220
enet: ethernet@61000000 {
203221
compatible = "brcm,ns2-amac";
204222
reg = <0x61000000 0x1000>,
@@ -334,6 +352,55 @@
334352
#iommu-cells = <1>;
335353
};
336354

355+
lcpll_ddr: clock-controller@6501d058 {
356+
#clock-cells = <1>;
357+
compatible = "brcm,ns2-lcpll-ddr";
358+
reg = <0x6501d058 0x20>,
359+
<0x6501c020 0x4>,
360+
<0x6501d04c 0x4>;
361+
clocks = <&osc>;
362+
clock-output-names = "lcpll_ddr", "pcie_sata_usb",
363+
"ddr", "ddr_ch2_unused",
364+
"ddr_ch3_unused", "ddr_ch4_unused",
365+
"ddr_ch5_unused";
366+
};
367+
368+
lcpll_ports: clock-controller@6501d078 {
369+
#clock-cells = <1>;
370+
compatible = "brcm,ns2-lcpll-ports";
371+
reg = <0x6501d078 0x20>,
372+
<0x6501c020 0x4>,
373+
<0x6501d054 0x4>;
374+
clocks = <&osc>;
375+
clock-output-names = "lcpll_ports", "wan", "rgmii",
376+
"ports_ch2_unused",
377+
"ports_ch3_unused",
378+
"ports_ch4_unused",
379+
"ports_ch5_unused";
380+
};
381+
382+
genpll_scr: clock-controller@6501d098 {
383+
#clock-cells = <1>;
384+
compatible = "brcm,ns2-genpll-scr";
385+
reg = <0x6501d098 0x32>,
386+
<0x6501c020 0x4>,
387+
<0x6501d044 0x4>;
388+
clocks = <&osc>;
389+
clock-output-names = "genpll_scr", "scr", "fs",
390+
"audio_ref", "scr_ch3_unused",
391+
"scr_ch4_unused", "scr_ch5_unused";
392+
};
393+
394+
genpll_sw: clock-controller@6501d0c4 {
395+
#clock-cells = <1>;
396+
compatible = "brcm,ns2-genpll-sw";
397+
reg = <0x6501d0c4 0x32>,
398+
<0x6501c020 0x4>,
399+
<0x6501d044 0x4>;
400+
clocks = <&osc>;
401+
clock-output-names = "genpll_sw", "rpe", "250", "nic",
402+
"chimp", "port", "sdio";
403+
};
337404
pinctrl: pinctrl@6501d130 {
338405
compatible = "brcm,ns2-pinmux";
339406
reg = <0x6501d130 0x08>,
@@ -438,8 +505,7 @@
438505
ranges = <0 0x65590000 0x10000>;
439506

440507
pmu@9000 {
441-
compatible = "arm,cci-400-pmu,r1",
442-
"arm,cci-400-pmu";
508+
compatible = "arm,cci-400-pmu,r1";
443509
reg = <0x9000 0x4000>;
444510
interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
445511
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
@@ -657,7 +723,7 @@
657723
reg = <0x66220000 0x28>;
658724
};
659725

660-
sata_phy: sata_phy@663f0100 {
726+
sata_phy: sata-phy@663f0100 {
661727
compatible = "brcm,iproc-ns2-sata-phy";
662728
reg = <0x663f0100 0x1f00>,
663729
<0x663f004c 0x10>;
@@ -701,7 +767,7 @@
701767
};
702768
};
703769

704-
sdio0: sdhci@66420000 {
770+
sdio0: mmc@66420000 {
705771
compatible = "brcm,sdhci-iproc-cygnus";
706772
reg = <0x66420000 0x100>;
707773
interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
@@ -711,7 +777,7 @@
711777
status = "disabled";
712778
};
713779

714-
sdio1: sdhci@66430000 {
780+
sdio1: mmc@66430000 {
715781
compatible = "brcm,sdhci-iproc-cygnus";
716782
reg = <0x66430000 0x100>;
717783
interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
@@ -721,7 +787,7 @@
721787
status = "disabled";
722788
};
723789

724-
nand: nand@66460000 {
790+
nand: nand-controller@66460000 {
725791
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
726792
reg = <0x66460000 0x600>,
727793
<0x67015408 0x600>,
@@ -746,7 +812,6 @@
746812
interrupts = <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>;
747813
interrupt-names = "spi_l1_intr";
748814
clocks = <&iprocmed>;
749-
clock-names = "iprocmed";
750815
num-cs = <2>;
751816
#address-cells = <1>;
752817
#size-cells = <0>;

‎arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
&nand {
9090
status = "okay";
91-
nandcs@0 {
91+
nand@0 {
9292
compatible = "brcm,nandcs";
9393
reg = <0>;
9494
nand-ecc-mode = "hw";

0 commit comments

Comments
 (0)